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

Satisfy Issue 271: Fly after teleport feature.

Browse Source 
Add debug setting LiruFlyAfterTeleports
Add Always fly after Teleports to General tab of System preferences.
(Also, fixed tabs where spaces should be in settings.xml)
This commit is contained in:
Inusaito Sayori
2012-12-16 20:50:40 -05:00
parent 46b5595c3f
commit 36a698fee4
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -692,22 +692,33 @@
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LiruNoTransactionClutter</key>
</map>
<key>LiruFlyAfterTeleport</key>
<map>
<key>Comment</key>
<string>Use notifytips for transactions instead of notifys, this way they do not collect in the top right of the screen.</string>
<string>Fly after teleports</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<integer>1</integer>
</map>
<key>LiruNoTransactionClutter</key>
<map>
<key>Comment</key>
<string>Use notifytips for transactions instead of notifys, this way they do not collect in the top right of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LiruSensibleARC</key>
<map>
<key>Comment</key>
<string>Use the old-style way to calculate Avatar Render Cost.
<string>Use the old-style way to calculate Avatar Render Cost.
Found in Advanced->Rendering->Info Displays</string>
<key>Persist</key>
<integer>1</integer>
@@ -715,7 +726,7 @@ Found in Advanced->Rendering->Info Displays</string>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
<key>MarketImporterUpdateFreq</key>
<map>
<key>Comment</key>

2
indra/newview/ascentprefssys.cpp
View File

@@ -267,6 +267,7 @@ void LLPrefsAscentSys::refreshValues()
mDoubleClickTeleport = gSavedSettings.getBOOL("DoubleClickTeleport");
mResetCameraAfterTP = gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
mOffsetTPByUserHeight = gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
mLiruFlyAfterTeleport = gSavedSettings.getBOOL("LiruFlyAfterTeleport");
mPreviewAnimInWorld = gSavedSettings.getBOOL("PreviewAnimInWorld");
mSaveScriptsAsMono = gSavedSettings.getBOOL("SaveInventoryScriptsAsMono");
mAlwaysRezInGroup = gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
@@ -416,6 +417,7 @@ void LLPrefsAscentSys::cancel()
gSavedSettings.setBOOL("DoubleClickTeleport", mDoubleClickTeleport);
gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
gSavedSettings.setBOOL("LiruFlyAfterTeleport", mLiruFlyAfterTeleport);
gSavedSettings.setBOOL("PreviewAnimInWorld", mPreviewAnimInWorld);
gSavedSettings.setBOOL("SaveInventoryScriptsAsMono", mSaveScriptsAsMono);
gSavedSettings.setBOOL("AscentAlwaysRezInGroup", mAlwaysRezInGroup);

1
indra/newview/ascentprefssys.h
View File

@@ -58,6 +58,7 @@ protected:
BOOL mDoubleClickTeleport;
BOOL mResetCameraAfterTP;
BOOL mOffsetTPByUserHeight;
bool mLiruFlyAfterTeleport;
BOOL mPreviewAnimInWorld;
BOOL mSaveScriptsAsMono;
BOOL mAlwaysRezInGroup;

3
indra/newview/llviewermessage.cpp
View File

@@ -6844,8 +6844,9 @@ void process_teleport_local(LLMessageSystem *msg,void**)
}
}
static LLCachedControl<bool> fly_after_tp(gSavedSettings, "LiruFlyAfterTeleport");
// Sim tells us whether the new position is off the ground
if (teleport_flags & TELEPORT_FLAGS_IS_FLYING)
if (fly_after_tp || (teleport_flags & TELEPORT_FLAGS_IS_FLYING))
{
gAgent.setFlying(TRUE);
}

1
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
View File

@@ -9,6 +9,7 @@
label="Reset camera after teleporting" tool_tip="Centers the camera behind you after a local teleport." name="center_after_teleport_check"/>
<check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Offset TP target by half agent height" tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for." name="offset_teleport_check"/>
<check_box left="10" follows="top" bottom_delta="-20" control_name="LiruFlyAfterTeleport" name="fly_after_tp" label="Always fly after teleports" tool_tip="Avoid those falls from great heights by automatically flying after teleporting in."/>
<check_box left="10" bottom_delta="-20" control_name="PreviewAnimInWorld" follows="top" initial_value="false"
label="Preview animations on the avatar instead on a dummy before uploading" tool_tip="The Animation upload window will play animations on your avatar when previewing them." name="preview_anim_in_world_check"/>
<check_box bottom_delta="-20" control_name="SaveInventoryScriptsAsMono" follows="left|top" initial_value="true"