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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source
This commit is contained in:
CharleyLevenque
2010-09-01 18:05:09 -04:00
parent 2a6a783d6a 441a7059f6
commit 0a0ce5cd09
5 changed files with 133 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,39 @@
<key>Value</key>
<real>100.0</real>
</map>
<key>AscentAvatarXModifier</key>
<map>
<key>Comment</key>
<string>Avatar position modifier (X)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>AscentAvatarYModifier</key>
<map>
<key>Comment</key>
<string>Avatar position modifier (Y)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>AscentAvatarZModifier</key>
<map>
<key>Comment</key>
<string>Avatar position modifier (Z)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>Ascentnumscripts</key>
<map>
<key>Comment</key>
@@ -112,6 +145,61 @@
<key>Value</key>
<real>0.0</real>
</map>
<key>AscentBuildPrefs_ActualRoot</key>
<map>
<key>Comment</key>
<string>Center selection on parent prim's center.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentBuildPrefs_PivotIsPercent</key>
<map>
<key>Comment</key>
<string>Would you like the chatbar to be able to be used for command line functions?</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentBuildPrefs_PivotX</key>
<map>
<key>Comment</key>
<string>idfk</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>AscentBuildPrefs_PivotY</key>
<map>
<key>Comment</key>
<string>idfk</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>AscentBuildPrefs_PivotZ</key>
<map>
<key>Comment</key>
<string>idfk</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>AscentCmdLine</key>
<map>
<key>Comment</key>

39
indra/newview/ascentprefssys.cpp
View File

@@ -64,9 +64,16 @@ private:
void refreshValues();
//General -----------------------------------------------------------------------------
BOOL mDoubleClickTeleport;
BOOL mResetCameraAfterTP;
BOOL mOffsetTPByUserHeight;
BOOL mPreviewAnimInWorld;
BOOL mSaveScriptsAsMono;
BOOL mAlwaysRezInGroup;
//Disable Teleport Progress
//Disable Logout progress
//always show Build
BOOL mAlwaysShowFly;
//Disable camera minimum distance
//Chat/IM -----------------------------------------------------------------------------
BOOL mHideNotificationsInChat;
BOOL mPlayTypingSound;
@@ -99,6 +106,7 @@ LLPrefsAscentSysImpl::LLPrefsAscentSysImpl()
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml");
childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
childSetCommitCallback("show_look_at_check", onCommitCheckBox, this);
refreshValues();
refresh();
}
@@ -132,9 +140,16 @@ void LLPrefsAscentSysImpl::refreshValues()
{
//General -----------------------------------------------------------------------------
mDoubleClickTeleport = gSavedSettings.getBOOL("DoubleClickTeleport");
mResetCameraAfterTP = gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
mOffsetTPByUserHeight = gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
mPreviewAnimInWorld = gSavedSettings.getBOOL("PreviewAnimInWorld");
mSaveScriptsAsMono = gSavedSettings.getBOOL("SaveScriptsAsMono");
mAlwaysRezInGroup = gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
//Disable Teleport Progress
//Disable Logout progress
//always show Build
mAlwaysShowFly = gSavedSettings.getBOOL("AscentFlyAlwaysEnabled");
//Disable camera minimum distance
//Chat/IMs ----------------------------------------------------------------------------
mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat");
mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification");
@@ -165,14 +180,19 @@ void LLPrefsAscentSysImpl::refreshValues()
}
void LLPrefsAscentSysImpl::refresh()
{
refreshValues();
{
//General -----------------------------------------------------------------------------
childSetValue("double_click_teleport_check", mDoubleClickTeleport);
childSetValue("center_after_teleport_check", mResetCameraAfterTP);
childSetValue("offset_teleport_check", mOffsetTPByUserHeight);
childSetValue("preview_anim_in_world_check", mPreviewAnimInWorld);
childSetValue("save_scripts_as_mono_check", mSaveScriptsAsMono);
childSetValue("always_rez_in_group_check", mAlwaysRezInGroup);
//Disable Teleport Progress
//Disable Logout progress
//always show Build
childSetValue("always_fly_check", mAlwaysShowFly);
//Disable camera minimum distance
//Chat --------------------------------------------------------------------------------
childSetValue("hide_notifications_in_chat_check", mHideNotificationsInChat);
childSetValue("play_typing_sound_check", mPlayTypingSound);
@@ -251,6 +271,8 @@ void LLPrefsAscentSysImpl::cancel()
{
//General -----------------------------------------------------------------------------
childSetValue("double_click_teleport_check", mDoubleClickTeleport);
childSetValue("center_after_teleport_check", mResetCameraAfterTP);
childSetValue("offset_teleport_check", mOffsetTPByUserHeight);
childSetValue("preview_anim_in_world_check", mPreviewAnimInWorld);
childSetValue("save_scripts_as_mono_check", mSaveScriptsAsMono);
childSetValue("always_rez_in_group_check", mAlwaysRezInGroup);
@@ -301,11 +323,20 @@ void LLPrefsAscentSysImpl::apply()
//General ------------------------------------------------------------------------------
gSavedSettings.setBOOL("DoubleClickTeleport", childGetValue("double_click_teleport_check"));
gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", childGetValue("center_after_teleport_check"));
gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", childGetValue("offset_teleport_check"));
gSavedSettings.setBOOL("PreviewAnimInWorld", childGetValue("preview_anim_in_world_check"));
gSavedSettings.setBOOL("SaveScriptsAsMono", childGetValue("save_scripts_as_mono_check"));
gSavedSettings.setBOOL("AscentAlwaysRezInGroup", childGetValue("always_rez_in_group_check"));
//Disable Teleport Progress
//Disable Logout progress
//always show Build
gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", childGetValue("always_fly_check"));
//Disable camera minimum distance
//Chat/IM ------------------------------------------------------------------------------
//Use Vertical IMs
//Script count
//Missing the echo/log option.
gSavedSettings.setBOOL("PlayTypingSound", childGetValue("play_typing_sound_check"));
gSavedSettings.setBOOL("AscentHideTypingNotification", childGetValue("hide_typing_check"));
@@ -397,7 +428,7 @@ void LLPrefsAscentSysImpl::apply()
gSavedSettings.setBOOL("PrivateLookAt", childGetValue("private_look_at_check"));
LLHUDEffectLookAt::sDebugLookAt = childGetValue("show_look_at_check");
gSavedSettings.setBOOL("RevokePermsOnStandUp", childGetValue("revoke_perms_on_stand_up_check"));
refreshValues();
}

3
indra/newview/llagent.cpp
View File

@@ -793,7 +793,8 @@ BOOL LLAgent::canFly()
if (isGodlike()) return TRUE;
// <edit>
if(gSavedSettings.getBOOL("AlwaysAllowFly")) return TRUE;
if(gSavedSettings.getBOOL("AscentFlyAlwaysEnabled"))
return TRUE;
// </edit>
LLViewerRegion* regionp = getRegion();

3
indra/newview/lloverlaybar.cpp
View File

@@ -137,10 +137,9 @@ LLOverlayBar::LLOverlayBar()
bool updateAdvSettingsPopup(const LLSD &data)
{
LLOverlayBar::sAdvSettingsPopup = gSavedSettings.getBOOL("wlfAdvSettingsPopup");
gOverlayBar->childSetVisible("AdvSettings_container", !LLOverlayBar::sAdvSettingsPopup);
gOverlayBar->childSetVisible("AdvSettings_container_exp", LLOverlayBar::sAdvSettingsPopup);
return true;
return false;
}
bool updateChatVisible(const LLSD &data)

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

@@ -2,7 +2,7 @@
<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
border="true" label="Ascent System" name="ascsys" enabled="true" mouse_opaque="true">
<tab_container label="Ascent" bottom="0" height="440" width="500" left="0"
name="Ascent System" tab_min_width="90" tab_position="top">
name="Ascent System" tab_min_width="70" tab_position="top">
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="General" name="User Interface">
<check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
@@ -45,13 +45,13 @@
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Disable the Teleport progress screens" left="10"
tool_tip="Viewer will not hide your UI while teleporting, allowing you to continue to read IMs."
mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
mouse_opaque="true" name="disable_tp_screen_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Hide the Logout progress screen" left="10"
tool_tip="Does not hide the UI when logging out."
mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
mouse_opaque="true" name="disable_logout_screen_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
@@ -69,7 +69,7 @@
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Disable camera minimum distance" left="10"
tool_tip="Allows the camera to get reeeaaally close to things."
mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
width="400" />
<!--<check_box bottom_delta="-20" control_name="AscentPowerfulWizard" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
@@ -370,5 +370,8 @@
mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
width="400" />
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Building" name="Building">
</panel>
</tab_container>
</panel>