diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 143 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 26 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 475 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings_per_account.xml | 14 |
4 files changed, 164 insertions, 494 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml new file mode 100644 index 0000000000..5cb8ddffcd --- /dev/null +++ b/indra/newview/app_settings/commands.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<commands> + <command name="avatar" + icon="Command_Avatar_Icon" + label_ref="Command_Avatar_Label" + tooltip_ref="Command_Avatar_Tooltip" + function="Floater.ToolbarToggle" + param="avatar" + /> + <command name="build" + icon="Command_Build_Icon" + label_ref="Command_Build_Label" + tooltip_ref="Command_Build_Tooltip" + function="Floater.ToolbarToggle" + param="build" + /> + <command name="chat" + icon="Command_Chat_Icon" + label_ref="Command_Chat_Label" + tooltip_ref="Command_Chat_Tooltip" + function="Floater.ToolbarToggle" + param="chat" + /> + <command name="compass" + icon="Command_Compass_Icon" + label_ref="Command_Compass_Label" + tooltip_ref="Command_Compass_Tooltip" + function="Floater.ToolbarToggle" + param="compass" + /> + <command name="gestures" + icon="Command_Gestures_Icon" + label_ref="Command_Gestures_Label" + tooltip_ref="Command_Gestures_Tooltip" + function="Floater.ToolbarToggle" + param="gestures" + /> + <command name="howto" + icon="Command_HowTo_Icon" + label_ref="Command_HowTo_Label" + tooltip_ref="Command_HowTo_Tooltip" + function="Floater.ToolbarToggle" + param="howto" + /> + <command name="landmarks" + icon="Command_Landmarks_Icon" + label_ref="Command_Landmarks_Label" + tooltip_ref="Command_Landmarks_Tooltip" + function="Floater.ToolbarToggle" + param="landmarks" + /> + <command name="map" + icon="Command_Map_Icon" + label_ref="Command_Map_Label" + tooltip_ref="Command_Map_Tooltip" + function="Floater.ToolbarToggle" + param="map" + /> + <command name="move" + icon="Command_Move_Icon" + label_ref="Command_Move_Label" + tooltip_ref="Command_Move_Tooltip" + function="Floater.ToolbarToggle" + param="move" + /> + <command name="myland" + icon="Command_MyLand_Icon" + label_ref="Command_MyLand_Label" + tooltip_ref="Command_MyLand_Tooltip" + function="Floater.ToolbarToggle" + param="myland" + /> + <command name="mystuff" + icon="Command_MyStuff_Icon" + label_ref="Command_MyStuff_Label" + tooltip_ref="Command_MyStuff_Tooltip" + function="Floater.ToolbarToggle" + param="mystuff" + /> + <command name="people" + icon="Command_People_Icon" + label_ref="Command_People_Label" + tooltip_ref="Command_People_Tooltip" + function="Floater.ToolbarToggle" + param="people" + /> + <command name="places" + icon="Command_Places_Icon" + label_ref="Command_Places_Label" + tooltip_ref="Command_Places_Tooltip" + function="Floater.ToolbarToggle" + param="places" + /> + <command name="search" + icon="Command_Search_Icon" + label_ref="Command_Search_Label" + tooltip_ref="Command_Search_Tooltip" + function="Floater.ToolbarToggle" + param="search" + /> + <command name="settings" + icon="Command_Settings_Icon" + label_ref="Command_Settings_Label" + tooltip_ref="Command_Settings_Tooltip" + function="Floater.ToolbarToggle" + param="settings" + /> + <command name="shop" + icon="Command_Shop_Icon" + label_ref="Command_Shop_Label" + tooltip_ref="Command_Shop_Tooltip" + function="Floater.ToolbarToggle" + param="shop" + /> + <command name="snapshot" + icon="Command_Snapshot_Icon" + label_ref="Command_Snapshot_Label" + tooltip_ref="Command_Snapshot_Tooltip" + function="Floater.ToolbarToggle" + param="snapshot" + /> + <command name="speak" + icon="Command_Speak_Icon" + label_ref="Command_Speak_Label" + tooltip_ref="Command_Speak_Tooltip" + function="Floater.ToolbarToggle" + param="speak" + /> + <command name="upload" + icon="Command_Upload_Icon" + label_ref="Command_Upload_Label" + tooltip_ref="Command_Upload_Tooltip" + function="Floater.ToolbarToggle" + param="upload" + /> + <command name="view" + icon="Command_View_Icon" + label_ref="Command_View_Label" + tooltip_ref="Command_View_Tooltip" + function="Floater.ToolbarToggle" + param="view" + /> +</commands> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 238e4296cf..f1db72e5cc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1858,7 +1858,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>Cursor3D</key> <map> @@ -2652,6 +2652,17 @@ <key>Value</key> <integer>-1</integer> </map> + <key>DebugToolbarFUI</key> + <map> + <key>Comment</key> + <string>Turn on the FUI Toolbars</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>DebugViews</key> <map> <key>Comment</key> @@ -4059,7 +4070,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]</string> + <string>http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY]&p=[AUTH_TOKEN]&r=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&build=[VERSION_BUILD]</string> </map> <key>WebProfileURL</key> <map> @@ -13528,17 +13539,6 @@ <key>Value</key> <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/404.html</string> </map> - <key>DestinationsAndAvatarsVisibility</key> - <map> - <key>Comment</key> - <string>Whether destination panel or avatar picker are open (0=destination guide, 1=avatar picker, default=nothing)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>0</integer> - </map> <key>OpenIMOnVoice</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 29e52ab054..01a70f2671 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -1,474 +1 @@ -<llsd> - <map> - <key>ChannelBottomPanelMargin</key> - <map> - <key>Comment</key> - <string>Space from a lower toast to the Bottom Tray</string> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>2</integer> - </map> - <key>ClickActionBuyEnabled</key> - <map> - <key>Comment</key> - <string>Enable click to buy actions in tool pie menu</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>ClickActionPayEnabled</key> - <map> - <key>Comment</key> - <string>Enable click to pay actions in tool pie menu</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableGrab</key> - <map> - <key>Comment</key> - <string>Use Ctrl+mouse to grab and manipulate objects</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableMouselook</key> - <map> - <key>Comment</key> - <string>Allow first person perspective and mouse control of camera</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>HelpURLFormat</key> - <map> - <key>Comment</key> - <string>URL pattern for help page; arguments will be encoded; see llviewerhelp.cpp:buildHelpURL for arguments</string> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/howto/index.html?topic=[TOPIC]</string> - </map> - <key>PreferredMaturity</key> - <map> - <key>Comment</key> - <string>Setting for the user's preferred maturity level (consts in indra_constants.h)</string> - <key>Type</key> - <string>U32</string> - <key>Value</key> - <integer>21</integer> - </map> - <key>RenderTrackerBeacon</key> - <map> - <key>Comment</key> - <string>Display tracking arrow and beacon to target avatar, teleport destination</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>ShowScriptErrors</key> - <map> - <key>Comment</key> - <string>Show script errors</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>ShowScriptErrorsLocation</key> - <map> - <key>Comment</key> - <string>Show script error in chat or window</string> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>SkinCurrent</key> - <map> - <key>Comment</key> - <string>The currently selected skin.</string> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>minimal</string> - </map> - <key>UseExternalBrowser</key> - <map> - <key>Comment</key> - <string>Use default browser when opening web pages instead of in-world browser.</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>VoiceCallsRejectGroup</key> - <map> - <key>Comment</key> - <string>Silently reject all incoming group voice calls.</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>VoiceDisableMic</key> - <map> - <key>Comment</key> - <string>Completely disable the ability to open the mic.</string> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>ScriptsCanShowUI</key> - <map> - <key>Comment</key> - <string>Allow LSL calls (such as LLMapDestination) to spawn viewer UI</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>ChatFontSize</key> - <map> - <key>Comment</key> - <string>Size of chat text in chat console (0 = small, 1 = big, 2 = extra large)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>AvatarPickerHintTimeout</key> - <map> - <key>Comment</key> - <string>Number of seconds to wait before telling resident about avatar picker.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>0.0</real> - </map> - <key>RenderShowGroupTitleAll</key> - <map> - <key>Comment</key> - <string>Show group titles in name labels</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>OpenSidePanelsInFloaters</key> - <map> - <key>Comment</key> - <string>If true, will always open side panel contents in a floater.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>AvatarInspectorTooltipDelay</key> - <map> - <key>Comment</key> - <string>Seconds before displaying avatar inspector tooltip</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>0.1</real> - </map> - <key>AFKTimeout</key> - <map> - <key>Comment</key> - <string> - Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never). - Valid values are: 0, 120, 300, 600, 1800 - </string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <real>0</real> - </map> - <key>SLURLTeleportDirectly</key> - <map> - <key>Comment</key> - <string>Clicking on a slurl will teleport you directly instead of opening places panel</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>EnableClassifieds</key> - <map> - <key>Comment</key> - <string>Enable creation of new classified ads</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableGroupInfo</key> - <map> - <key>Comment</key> - <string>Enable viewing and editing of group info.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnablePlaceProfile</key> - <map> - <key>Comment</key> - <string>Enable viewing of place profile from web link</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnablePicks</key> - <map> - <key>Comment</key> - <string>Enable editing of picks</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableWorldMap</key> - <map> - <key>Comment</key> - <string>Enable opening world map from web link</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableAvatarPay</key> - <map> - <key>Comment</key> - <string>Enable paying other avatars from web link</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableVoiceCall</key> - <map> - <key>Comment</key> - <string>Enable voice calls from web link</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>EnableAvatarShare</key> - <map> - <key>Comment</key> - <string>Enable sharing from web link</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableInventory</key> - <map> - <key>Comment</key> - <string>Enable opening inventory from web link</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableSearch</key> - <map> - <key>Comment</key> - <string>Enable opening search from web link</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableAppearance</key> - <map> - <key>Comment</key> - <string>Enable opening appearance from web link</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>DoubleClickShowWorldMap</key> - <map> - <key>Comment</key> - <string>Enable double-click to show world map from mini map</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>EnableGroupChatPopups</key> - <map> - <key>Comment</key> - <string>Enable Incoming Group Chat Popups</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>SearchFromAddressBar</key> - <map> - <key>Comment</key> - <string>Can enter search queries into navigation address bar</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>DestinationGuideURL</key> - <map> - <key>Comment</key> - <string>Destination guide contents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html</string> - </map> - <key>AvatarPickerURL</key> - <map> - <key>Comment</key> - <string>Avatar picker contents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/avatars.html</string> - </map> - <key>LogInventoryDecline</key> - <map> - <key>Comment</key> - <string>Log in system chat whenever an inventory offer is declined</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>UseHTTPInventory</key> - <map> - <key>Comment</key> - <string>Allow use of http inventory transfers instead of UDP</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>ClickToWalk</key> - <map> - <key>Comment</key> - <string>Click in world to walk to location</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>ShowOfferedInventory</key> - <map> - <key>Comment</key> - <string>Show inventory window with last inventory offer selected when receiving inventory from other users.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>OpenIMOnVoice</key> - <map> - <key>Comment</key> - <string>Open the corresponding IM window when connecting to a voice call.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - <key>AllowBottomTrayButtonReordering</key> - <map> - <key>Comment</key> - <string>Allow user to move and hide bottom tray buttons</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>ShowHelpOnFirstLogin</key> - <map> - <key>Comment</key> - <string>Show Help Floater on first login</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> - </map> -</llsd> +<llsd/>
\ No newline at end of file diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index c7140283f1..d8295ddb87 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -34,15 +34,15 @@ <string /> </map> <key>LastInventoryInboxActivity</key> - <map> - <key>Comment</key> + <map> + <key>Comment</key> <string>The last time the received items inbox was poked by the user.</string> - <key>Persist</key> + <key>Persist</key> <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string /> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>0</integer> </map> <key>LastLogoff</key> <map> |