various misc fixes from merge.

Engine/source/core/util/str.cpp

@@ -284,8 +284,8 @@ class String::StringData : protected StringDataImpl
             delete [] mUTF16;
       }
 
-      void* TORQUE_NOINLINE operator new(size_t size, U32 len);
-      void* TORQUE_NOINLINE operator new( size_t size, U32 len, DataChunker& chunker );
+      TORQUE_NOINLINE void* operator new(size_t size, U32 len);
+      TORQUE_NOINLINE void* operator new( size_t size, U32 len, DataChunker& chunker );
       void operator delete(void *);
 
       bool isShared() const

Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/shape.tscript

@@ -340,7 +340,7 @@ function AssetBrowser::onShapeAssetEditorDropped(%this, %assetDef, %position)
    
    %newStatic = new TSStatic()
    {
-      position = %pos;
+      position = %position;
       shapeAsset = %assetId;
    };
    

Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript

@@ -515,6 +515,7 @@ function ESettingsWindow::getAssetEditingSettings(%this)
    SettingsInspector.addSettingsField("Assets/New/alwaysPromptModuleTarget", "Always Prompt Target Module", "bool", "If off, use the default module"); 
    SettingsInspector.endGroup();
    
+   %formattedConfigList = "";
    for(%i=0; %i < ImportAssetWindow.importConfigsList.Count(); %i++)
    {
       %configName = ImportAssetWindow.importConfigsList.getKey(%i);

Templates/BaseGame/game/tools/worldEditor/scripts/interfaces/terrainMaterialDlg.ed.tscript

@@ -298,7 +298,7 @@ function TerrainMaterialDlg::changeTerrainMatMapAsset(%this)
 
    %targetMap.setBitmap( %image );  
 
-   %targetMapName = %mapName @ "AssetId";
+   %targetMapName = %targetMap @ "AssetId";
    %targetMapName.setText(%imgAsset);
 
    TerrainMaterialDlg.matDirty = true;