Merge branch 'master' of github.com:TrinityCore/TrinityCore

Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Server/Protocol/Opcodes.cpp

1 files changed, 4 insertions, 4 deletions

diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp
index 594e1a9382b..533a7ca825c 100644
--- a/src/server/collision/Maps/TileAssembler.cpp
+++ b/src/server/collision/Maps/TileAssembler.cpp
@@ -500,10 +500,10 @@ namespace VMAP
         {
             model.setGroupModels(groupsArray);
 
-            std::string filename(iSrcDir);
-            filename.push_back('/');
-            filename.append(pModelFilename).append(".vmo");
-            success = model.writeFile(filename);
+            std::string worldModelFileName(iSrcDir);
+            worldModelFileName.push_back('/');
+            worldModelFileName.append(pModelFilename).append(".vmo");
+            success = model.writeFile(worldModelFileName);
         }
 
         //std::cout << "readRawFile2: '" << pModelFilename << "' tris: " << nElements << " nodes: " << nNodes << std::endl;