Merge 2.0 branch to trunk.

git-svn-id: http://svn.openlayers.org/trunk/openlayers@1369 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
2006-08-25 18:17:06 +00:00
parent 282d9d6047
commit 104e509eb9
47 changed files with 840 additions and 483 deletions
@@ -121,10 +121,10 @@ OpenLayers.Layer.WMS.prototype =
     * 
     * Once params have been changed, we will need to re-init our tiles
     * 
-     * @param {Object} params Hashtable of new params to use
+     * @param {Object} newParams Hashtable of new params to use
     */
-    mergeNewParams:function(params) {
-        var upperParams = OpenLayers.Util.upperCaseObject(params);
+    mergeNewParams:function(newParams) {
+        var upperParams = OpenLayers.Util.upperCaseObject(newParams);
        var newArguments = [upperParams];
        OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this, 
                                                             newArguments);