Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added performance tab to inert options, added ability to disable / enable wind at runtime

Browse Source
This commit is contained in:
Hazim Gazov
2010-04-17 21:24:13 -03:00
parent 615202da70
commit faf628668b
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/hbprefsinert.cpp
View File

@@ -38,6 +38,7 @@
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llcombobox.h" #include "llcombobox.h"
#include "llwind.h"
class LLPrefsInertImpl : public LLPanel class LLPrefsInertImpl : public LLPanel
{ {
@@ -63,6 +64,7 @@ private:
BOOL mPreviewAnimInWorld; BOOL mPreviewAnimInWorld;
BOOL mSpeedRez; BOOL mSpeedRez;
BOOL mRevokePermsOnStandUp; BOOL mRevokePermsOnStandUp;
BOOL mEnableLLWind;
U32 mSpeedRezInterval; U32 mSpeedRezInterval;
U32 mLinksForChattingObjects; U32 mLinksForChattingObjects;
U32 mTimeFormat; U32 mTimeFormat;
@@ -111,6 +113,7 @@ void LLPrefsInertImpl::refreshValues()
mSpeedRezInterval = gSavedSettings.getU32("SpeedRezInterval"); mSpeedRezInterval = gSavedSettings.getU32("SpeedRezInterval");
mLinksForChattingObjects = gSavedSettings.getU32("LinksForChattingObjects"); mLinksForChattingObjects = gSavedSettings.getU32("LinksForChattingObjects");
mRevokePermsOnStandUp = gSavedSettings.getBOOL("RevokePermsOnStandUp"); mRevokePermsOnStandUp = gSavedSettings.getBOOL("RevokePermsOnStandUp");
mEnableLLWind = gSavedSettings.getBOOL("WindEnabled");
} }
void LLPrefsInertImpl::refresh() void LLPrefsInertImpl::refresh()
@@ -183,6 +186,8 @@ void LLPrefsInertImpl::cancel()
gSavedSettings.setU32("SpeedRezInterval", mSpeedRezInterval); gSavedSettings.setU32("SpeedRezInterval", mSpeedRezInterval);
gSavedSettings.setU32("LinksForChattingObjects", mLinksForChattingObjects); gSavedSettings.setU32("LinksForChattingObjects", mLinksForChattingObjects);
gSavedSettings.setBOOL("RevokePermsOnStandUp", mRevokePermsOnStandUp); gSavedSettings.setBOOL("RevokePermsOnStandUp", mRevokePermsOnStandUp);
gSavedSettings.setBOOL("WindEnabled", mEnableLLWind);
gLLWindEnabled = mEnableLLWind;
} }
void LLPrefsInertImpl::apply() void LLPrefsInertImpl::apply()

8
indra/newview/skins/default/xui/en-us/panel_preferences_inert.xml
View File

@@ -83,6 +83,14 @@
</radio_item> </radio_item>
</radio_group> </radio_group>
</panel> </panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Performance" name="Performance">
<check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Enable Wind Effects" left="10"
mouse_opaque="true" name="enable_wind" radio_style="false"
width="400" />
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true" <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Miscellaneous" name="Miscellaneous"> follows="left|top|right|bottom" label="Miscellaneous" name="Miscellaneous">
<check_box bottom_delta="-30" control_name="DoubleClickTeleport" enabled="true" <check_box bottom_delta="-30" control_name="DoubleClickTeleport" enabled="true"