diff options
| author | McCabe Maxsted | 2010-10-09 03:27:47 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-09 03:27:47 -0700 |
| commit | 1866bc2af39189c17b636970d4df7edc983c1830 (patch) | |
| tree | e60963a49832280cf3d2d9b5a8b589853469caee /linden/indra/newview/llfloatersettingsdebug.cpp | |
| parent | Use all those cores for compile (diff) | |
| download | meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.zip meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.gz meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.bz2 meta-impy-1866bc2af39189c17b636970d4df7edc983c1830.tar.xz | |
Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett
Diffstat (limited to 'linden/indra/newview/llfloatersettingsdebug.cpp')
| -rw-r--r-- | linden/indra/newview/llfloatersettingsdebug.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp index fd6c47b..0aa0607 100644 --- a/linden/indra/newview/llfloatersettingsdebug.cpp +++ b/linden/indra/newview/llfloatersettingsdebug.cpp | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include "llcolorswatch.h" | 40 | #include "llcolorswatch.h" |
| 41 | #include "llviewercontrol.h" | 41 | #include "llviewercontrol.h" |
| 42 | 42 | ||
| 43 | // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0g) | 43 | // [RLVa:KB] |
| 44 | #include "rlvhandler.h" | 44 | #include "rlvhandler.h" |
| 45 | #include "rlvextensions.h" | 45 | #include "rlvextensions.h" |
| 46 | // [/RLVa:KB] | 46 | // [/RLVa:KB] |
| @@ -258,7 +258,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp) | |||
| 258 | fEnable &= !((gRlvHandler.hasBehaviour(RLV_BHVR_SETENV)) && | 258 | fEnable &= !((gRlvHandler.hasBehaviour(RLV_BHVR_SETENV)) && |
| 259 | (("VertexShaderEnable" == controlp->getName()) || ("WindLightUseAtmosShaders" == controlp->getName()))); | 259 | (("VertexShaderEnable" == controlp->getName()) || ("WindLightUseAtmosShaders" == controlp->getName()))); |
| 260 | #ifdef RLV_EXTENSION_STARTLOCATION | 260 | #ifdef RLV_EXTENSION_STARTLOCATION |
| 261 | // Don't allow toggling RestrainedLifeLoginLastLocation | 261 | // Don't allow toggling RLVaLoginLastLocation |
| 262 | fEnable &= !(RLV_SETTING_LOGINLASTLOCATION == controlp->getName()); | 262 | fEnable &= !(RLV_SETTING_LOGINLASTLOCATION == controlp->getName()); |
| 263 | #endif // RLV_EXTENSION_STARTLOCATION | 263 | #endif // RLV_EXTENSION_STARTLOCATION |
| 264 | 264 | ||