Merge with siana/future

This commit is contained in:
Shyotl
2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions

View File

@@ -43,6 +43,8 @@ F32 gPrehashVersionNumber = 2.000f;
char* _PREHASH_X = LLMessageStringTable::getInstance()->getString("X");
char* _PREHASH_Y = LLMessageStringTable::getInstance()->getString("Y");
char* _PREHASH_Z = LLMessageStringTable::getInstance()->getString("Z");
char* _PREHASH_SizeX = LLMessageStringTable::getInstance()->getString("SizeX");
char* _PREHASH_SizeY = LLMessageStringTable::getInstance()->getString("SizeY");
char* _PREHASH_AddFlags = LLMessageStringTable::getInstance()->getString("AddFlags");
char* _PREHASH_FailureInfo = LLMessageStringTable::getInstance()->getString("FailureInfo");
char* _PREHASH_MapData = LLMessageStringTable::getInstance()->getString("MapData");