diff options
| author | elektrahesse | 2010-09-27 14:05:15 +0200 |
|---|---|---|
| committer | elektrahesse | 2010-09-27 14:05:15 +0200 |
| commit | b0bc29569cacfcd4fd661f6dd9e32364ebfbf243 (patch) | |
| tree | 0af5d17a0ee910959e64b26f5ca2573fc269c0ff /linden/indra/newview/llappviewer.cpp | |
| parent | Changes the search system, so it matches the keyword against name or surname ... (diff) | |
| parent | Converted XUI files to unix line endings, again. (diff) | |
| download | meta-impy-b0bc29569cacfcd4fd661f6dd9e32364ebfbf243.zip meta-impy-b0bc29569cacfcd4fd661f6dd9e32364ebfbf243.tar.gz meta-impy-b0bc29569cacfcd4fd661f6dd9e32364ebfbf243.tar.bz2 meta-impy-b0bc29569cacfcd4fd661f6dd9e32364ebfbf243.tar.xz | |
Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly
Diffstat (limited to 'linden/indra/newview/llappviewer.cpp')
| -rw-r--r-- | linden/indra/newview/llappviewer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index b3f3e59..817517e 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
| @@ -4146,9 +4146,10 @@ void LLAppViewer::resumeMainloopTimeout(const std::string& state, F32 secs) | |||
| 4146 | { | 4146 | { |
| 4147 | if(secs < 0.0f) | 4147 | if(secs < 0.0f) |
| 4148 | { | 4148 | { |
| 4149 | secs = gSavedSettings.getF32("MainloopTimeoutDefault"); | 4149 | static F32 *sMainloopTimeoutDefault = rebind_llcontrol<F32>("MainloopTimeoutDefault", &gSavedSettings, true); |
| 4150 | secs = *sMainloopTimeoutDefault; | ||
| 4150 | } | 4151 | } |
| 4151 | 4152 | ||
| 4152 | mMainloopTimeout->setTimeout(secs); | 4153 | mMainloopTimeout->setTimeout(secs); |
| 4153 | mMainloopTimeout->start(state); | 4154 | mMainloopTimeout->start(state); |
| 4154 | } | 4155 | } |
| @@ -4173,7 +4174,8 @@ void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs) | |||
| 4173 | { | 4174 | { |
| 4174 | if(secs < 0.0f) | 4175 | if(secs < 0.0f) |
| 4175 | { | 4176 | { |
| 4176 | secs = gSavedSettings.getF32("MainloopTimeoutDefault"); | 4177 | static F32 *sMainloopTimeoutDefault = rebind_llcontrol<F32>("MainloopTimeoutDefault", &gSavedSettings, true); |
| 4178 | secs = *sMainloopTimeoutDefault; | ||
| 4177 | } | 4179 | } |
| 4178 | 4180 | ||
| 4179 | mMainloopTimeout->setTimeout(secs); | 4181 | mMainloopTimeout->setTimeout(secs); |