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

I hate being unsat when pressing ESC

Browse Source
This commit is contained in:
Siana Gearz
2010-11-29 00:23:02 +01:00
parent 601ac48a2d
commit e1b9109bee
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/app_settings/settings.xml
View File

@@ -10,8 +10,19 @@
</array--> </array-->
<!-- !!! settings_ascent.xml --> <!-- !!! settings_ascent.xml -->
<key>SianaUnsitOnCamReset</key>
<map>
<key>Comment</key>
<string>Make avatar stand up when camera is reset to 3rd Person View</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>PhoenixNameSystem</key> <key>PhoenixNameSystem</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

13
indra/newview/llagent.cpp
View File

@@ -4191,15 +4191,16 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
return; return;
} }
// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) +SG
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) ) if ( (!gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
&& (mAvatarObject.notNull())
&& (mAvatarObject->mIsSitting)
&& gSavedSettings.getBOOL("SianaUnsitOnCamReset"))
{ {
return; setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
} }
// [/RLVa:KB] // [/RLVa:KB]
setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
gViewerWindow->getWindow()->resetBusyCount(); gViewerWindow->getWindow()->resetBusyCount();
mCameraZoomFraction = INITIAL_ZOOM_FRACTION; mCameraZoomFraction = INITIAL_ZOOM_FRACTION;

2
indra/newview/llpanelinput.cpp
View File

@@ -64,6 +64,7 @@ BOOL LLPanelInput::postBuild()
childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse")); childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse"));
childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement")); childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement"));
childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement")); childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement"));
childSetValue("unsit_on_camera_reset", gSavedSettings.getBOOL("SianaUnsitOnCamReset"));
childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible")); childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible"));
LLSliderCtrl* fov_slider = getChild<LLSliderCtrl>("camera_fov"); LLSliderCtrl* fov_slider = getChild<LLSliderCtrl>("camera_fov");
@@ -91,6 +92,7 @@ void LLPanelInput::apply()
gSavedSettings.setBOOL("InvertMouse", childGetValue("invert_mouse")); gSavedSettings.setBOOL("InvertMouse", childGetValue("invert_mouse"));
gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement")); gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement"));
gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement")); gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement"));
gSavedSettings.setBOOL("SianaUnsitOnCamReset", childGetValue("unsit_on_camera_reset"));
gSavedSettings.setF32("CameraAngle", mPreAdjustFOV); gSavedSettings.setF32("CameraAngle", mPreAdjustFOV);
gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible")); gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible"));
} }

5
indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
View File

@@ -68,6 +68,11 @@
label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true" label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
name="appearance_camera_movement" radio_style="false" name="appearance_camera_movement" radio_style="false"
tool_tip="Use automatic camera positioning while in edit mode" width="242" /> tool_tip="Use automatic camera positioning while in edit mode" width="242" />
<check_box bottom_delta="-18" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Unsit Avatar on Camera Reset" left="148" mouse_opaque="true"
name="unsit_on_camera_reset" radio_style="false"
tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode" width="242" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top" bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"