diff options
| author | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
|---|---|---|
| committer | megamage <none@none.none> | 2011-10-07 12:48:20 -0400 |
| commit | 42d1562183dd0598de155e30264393edc6925a21 (patch) | |
| tree | 73263639af50fcf177ff9bdf3791d8fc5afce454 /src/server/shared/Common.cpp | |
| parent | 7f4be7e93a03c2f4c964590efb166c7dadcb6837 (diff) | |
| parent | 7f89678bcda1b58ff0701c0915074e81a9caf720 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git
Conflicts:
src/server/game/Entities/Player/Player.cpp
Diffstat (limited to 'src/server/shared/Common.cpp')
| -rwxr-xr-x | src/server/shared/Common.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/shared/Common.cpp b/src/server/shared/Common.cpp index 3cd76181b3b..68b5a62b963 100755 --- a/src/server/shared/Common.cpp +++ b/src/server/shared/Common.cpp @@ -33,7 +33,7 @@ char const* localeNames[TOTAL_LOCALES] = { LocaleConstant GetLocaleByName(const std::string& name) { for (uint32 i = 0; i < TOTAL_LOCALES; ++i) - if(name==localeNames[i]) + if (name==localeNames[i]) return LocaleConstant(i); return LOCALE_enUS; // including enGB case |