From 51665a0b313ad85ed3b40d7a83ae6ec3af939ba8 Mon Sep 17 00:00:00 2001 From: Beeks Date: Sat, 4 Sep 2010 19:22:52 -0400 Subject: [PATCH] Linux compile error fix regarding FreezeTime - FreezeTime is a Bool, not an F32. Tools floater was fixed so that the Last Owner text would fade out properly. Minor tweak to the wlf settings again, to hopefully ensure it will always start closed. Signed-off-by: Beeks --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llagent.cpp | 2 +- indra/newview/skins/default/xui/en-us/floater_tools.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8eea88f97..047b09f15 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -601,7 +601,7 @@ Comment Show Windlight popup Persist - 1 + 0 Type Boolean Value diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index b60be99eb..6b45ca1ae 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1981,7 +1981,7 @@ void LLAgent::cameraOrbitIn(const F32 meters) mCameraZoomFraction = (mTargetCameraDistance - meters) / camera_offset_dist; - if (!gSavedSettings.getF32("FreezeTime") && mCameraZoomFraction < MIN_ZOOM_FRACTION && meters > 0.f) + if (!gSavedSettings.getBOOL("FreezeTime") && mCameraZoomFraction < MIN_ZOOM_FRACTION && meters > 0.f) { // No need to animate, camera is already there. changeCameraToMouselook(FALSE); diff --git a/indra/newview/skins/default/xui/en-us/floater_tools.xml b/indra/newview/skins/default/xui/en-us/floater_tools.xml index 7c71dc508..6823e4f6e 100644 --- a/indra/newview/skins/default/xui/en-us/floater_tools.xml +++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml @@ -373,7 +373,7 @@ + mouse_opaque="true" name="Last Owner:" v_pad="0" width="78"> Last Owner: