aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelgeneral.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-11-08 13:23:54 -0700
committerMcCabe Maxsted2009-11-08 13:23:54 -0700
commitd9ecd6fde8f588d8be9a54a3ebc301bab1e99754 (patch)
tree1f595f7577a5134b29e4933d1ce6b4b52e9c1f57 /linden/indra/newview/llpanelgeneral.cpp
parentMerged working branch of 1.2 into LL 1.23 merge (diff)
parentChanged version to 1.20 in other files (diff)
downloadmeta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.zip
meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.gz
meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.bz2
meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.xz
Merged almost-final version of Imprudence 1.2 into 1.3
Diffstat (limited to 'linden/indra/newview/llpanelgeneral.cpp')
-rw-r--r--linden/indra/newview/llpanelgeneral.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 51cac4b..adb4cfc 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -165,5 +165,5 @@ void LLPanelGeneral::cancel()
165void LLPanelGeneral::onClickResetUISize(void* user_data) 165void LLPanelGeneral::onClickResetUISize(void* user_data)
166{ 166{
167 LLPanelGeneral* self = (LLPanelGeneral*)user_data; 167 LLPanelGeneral* self = (LLPanelGeneral*)user_data;
168 self->childSetValue("ui_scale_slider", 1.0f); 168 self->childSetValue("ui_scale_slider", 1.002f);
169} 169}