diff options
author | McCabe Maxsted | 2010-08-05 16:22:40 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-08-26 11:16:30 -0700 |
commit | 63bdaa816280d4bf2a0ec027f787099f92e80577 (patch) | |
tree | f0f393f954079225dca7b269021f4d582219ffa3 /linden/indra | |
parent | Added menu option for toggling IM auto-responses on/off underneath the Busy o... (diff) | |
download | meta-impy-63bdaa816280d4bf2a0ec027f787099f92e80577.zip meta-impy-63bdaa816280d4bf2a0ec027f787099f92e80577.tar.gz meta-impy-63bdaa816280d4bf2a0ec027f787099f92e80577.tar.bz2 meta-impy-63bdaa816280d4bf2a0ec027f787099f92e80577.tar.xz |
Fixed the shadows checkbox not showing whether or not shadows were enabled
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llprefsadvanced.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp index 60c936a..56c72c4 100644 --- a/linden/indra/newview/llprefsadvanced.cpp +++ b/linden/indra/newview/llprefsadvanced.cpp | |||
@@ -69,6 +69,7 @@ BOOL LLPrefsAdvanced::postBuild() | |||
69 | childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic")); | 69 | childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic")); |
70 | childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose")); | 70 | childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose")); |
71 | childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC")); | 71 | childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC")); |
72 | childSetValue("shadows_check", gSavedSettings.getBOOL("ShadowsEnabled")); | ||
72 | 73 | ||
73 | childSetValue("lightshare_combo", | 74 | childSetValue("lightshare_combo", |
74 | LLSD((S32)gSavedSettings.getU32("LightShareAllowed"))); | 75 | LLSD((S32)gSavedSettings.getU32("LightShareAllowed"))); |
@@ -131,6 +132,7 @@ void LLPrefsAdvanced::apply() | |||
131 | childSetValue("shadows_check", FALSE); | 132 | childSetValue("shadows_check", FALSE); |
132 | LLNotifications::instance().add("NoShadows"); | 133 | LLNotifications::instance().add("NoShadows"); |
133 | llwarns << "Attempting to enable shadow rendering while graphics settings less than Ultra or shaders are missing!" << llendl; | 134 | llwarns << "Attempting to enable shadow rendering while graphics settings less than Ultra or shaders are missing!" << llendl; |
135 | gSavedSettings.setBOOL("ShadowsEnabled", FALSE); | ||
134 | } | 136 | } |
135 | else if ( (gSavedSettings.getBOOL("WindLightUseAtmosShaders") // If we do, toggle shadows in the correct order | 137 | else if ( (gSavedSettings.getBOOL("WindLightUseAtmosShaders") // If we do, toggle shadows in the correct order |
136 | && gSavedSettings.getBOOL("VertexShaderEnable")) ) | 138 | && gSavedSettings.getBOOL("VertexShaderEnable")) ) |
@@ -138,6 +140,7 @@ void LLPrefsAdvanced::apply() | |||
138 | gSavedSettings.setBOOL("RenderUseFBO", childGetValue("shadows_check").asBoolean()); | 140 | gSavedSettings.setBOOL("RenderUseFBO", childGetValue("shadows_check").asBoolean()); |
139 | gSavedSettings.setBOOL("RenderDeferred", childGetValue("shadows_check").asBoolean()); | 141 | gSavedSettings.setBOOL("RenderDeferred", childGetValue("shadows_check").asBoolean()); |
140 | llinfos << "Shadow rendering enabled" << llendl; | 142 | llinfos << "Shadow rendering enabled" << llendl; |
143 | gSavedSettings.setBOOL("ShadowsEnabled", TRUE); | ||
141 | } | 144 | } |
142 | } | 145 | } |
143 | else if (!childGetValue("shadows_check").asBoolean()) | 146 | else if (!childGetValue("shadows_check").asBoolean()) |
@@ -147,9 +150,9 @@ void LLPrefsAdvanced::apply() | |||
147 | gSavedSettings.setBOOL("RenderDeferred", childGetValue("shadows_check").asBoolean()); | 150 | gSavedSettings.setBOOL("RenderDeferred", childGetValue("shadows_check").asBoolean()); |
148 | gSavedSettings.setBOOL("RenderUseFBO", childGetValue("shadows_check").asBoolean()); | 151 | gSavedSettings.setBOOL("RenderUseFBO", childGetValue("shadows_check").asBoolean()); |
149 | llinfos << "Shadow rendering disabled" << llendl; | 152 | llinfos << "Shadow rendering disabled" << llendl; |
153 | gSavedSettings.setBOOL("ShadowsEnabled", FALSE); | ||
150 | } | 154 | } |
151 | } | 155 | } |
152 | gSavedSettings.setBOOL("ShadowsEnabled", childGetValue("shadows_check").asBoolean()); | ||
153 | 156 | ||
154 | if (gSavedSettings.getBOOL("LegacyPieEnabled") == !((BOOL)childGetValue("legacy_pie_menu_checkbox"))) | 157 | if (gSavedSettings.getBOOL("LegacyPieEnabled") == !((BOOL)childGetValue("legacy_pie_menu_checkbox"))) |
155 | { | 158 | { |