diff options
| author | McCabe Maxsted | 2010-08-26 11:04:43 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-09-25 08:35:35 -0700 |
| commit | db9616811d45e168d81c8e464fb8a9cf27e51172 (patch) | |
| tree | a8539baeb46297d51072285d946f925a8544eb64 /linden/indra/newview/llviewerobjectlist.cpp | |
| parent | Revert "Updated boost 1.36 libs for Windows to support local textures (todo: ... (diff) | |
| download | meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.zip meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.gz meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.bz2 meta-impy-db9616811d45e168d81c8e464fb8a9cf27e51172.tar.xz | |
Ported gSavedSettings changes from Emerald (as well as modifying a few of ours)
Diffstat (limited to 'linden/indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | linden/indra/newview/llviewerobjectlist.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp index bfb248b..78ce247 100644 --- a/linden/indra/newview/llviewerobjectlist.cpp +++ b/linden/indra/newview/llviewerobjectlist.cpp | |||
| @@ -698,7 +698,9 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world) | |||
| 698 | } | 698 | } |
| 699 | } | 699 | } |
| 700 | 700 | ||
| 701 | if (gSavedSettings.getBOOL("FreezeTime")) | 701 | static BOOL* sFreezeTime = rebind_llcontrol<BOOL>("FreezeTime", &gSavedSettings, true); |
| 702 | |||
| 703 | if ((*sFreezeTime)) | ||
| 702 | { | 704 | { |
| 703 | for (std::vector<LLViewerObject*>::iterator iter = idle_list.begin(); | 705 | for (std::vector<LLViewerObject*>::iterator iter = idle_list.begin(); |
| 704 | iter != idle_list.end(); iter++) | 706 | iter != idle_list.end(); iter++) |