Merge shyotl, setting include broken (disabled)

This commit is contained in:
Siana Gearz
2010-11-09 15:14:34 +01:00
61 changed files with 3320 additions and 2231 deletions

View File

@@ -728,7 +728,7 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
}
}
static LLCachedControl<bool> freeze_time("FreezeTime",0);
static const LLCachedControl<bool> freeze_time("FreezeTime",0);
if (freeze_time)
{
for (std::vector<LLViewerObject*>::iterator iter = idle_list.begin();