From 06531fc24ddea13a1a606c377e02dcd5f682857d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 8 Sep 2011 17:16:35 -0400 Subject: SRCH-1623: UNDO EXP--1081 --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 43aa67e949..21b08c13c3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4048,7 +4048,7 @@ Type String Value - http://search.secondlife.com/viewer/[CATEGORY]/?q=[QUERY] + 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] WebProfileURL -- cgit v1.2.3 From c04412f726f94eff3f869c3c2393bbf00ce59062 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 12 Sep 2011 17:22:36 -0400 Subject: sh-2379: re-enable multi-threaded curl (fixes viewer stall, may re-introduce some crashes) --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 21b08c13c3..ad9b3f63e3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1858,7 +1858,7 @@ Type Boolean Value - 0 + 1 Cursor3D -- cgit v1.2.3 From ba96fb5c2b6801398481a30189f991cff98fed8b Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Mon, 12 Sep 2011 16:06:58 -0700 Subject: EXP-1199 FIX -- Inbox new tag sometimes differs from recent item delivery times, sim timezone settings differences suspected. * LastInventoryInboxActivity setting now stored as the value of time_correct(), the corrected time difference (established at login) between the client and official SL time. --- indra/newview/app_settings/settings_per_account.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/app_settings') 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 @@ LastInventoryInboxActivity - - Comment + + Comment The last time the received items inbox was poked by the user. - Persist + Persist 1 - Type - String - Value - + Type + U32 + Value + 0 LastLogoff -- cgit v1.2.3 From bc3f0e0a81af79820a0c0a6877d266fca46ef917 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 20 Sep 2011 18:47:13 -0700 Subject: EXP-1230 FIX As a resident, I want to not have to choose a UI mode removed all references to basic mode --- indra/newview/app_settings/settings.xml | 11 - indra/newview/app_settings/settings_minimal.xml | 474 ------------------------ 2 files changed, 485 deletions(-) delete mode 100644 indra/newview/app_settings/settings_minimal.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 60025707a4..4e48a9e3f7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13528,17 +13528,6 @@ Value http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/404.html - DestinationsAndAvatarsVisibility - - Comment - Whether destination panel or avatar picker are open (0=destination guide, 1=avatar picker, default=nothing) - Persist - 1 - Type - S32 - Value - 0 - OpenIMOnVoice Comment diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml deleted file mode 100644 index 29e52ab054..0000000000 --- a/indra/newview/app_settings/settings_minimal.xml +++ /dev/null @@ -1,474 +0,0 @@ - - - ChannelBottomPanelMargin - - Comment - Space from a lower toast to the Bottom Tray - Type - S32 - Value - 2 - - ClickActionBuyEnabled - - Comment - Enable click to buy actions in tool pie menu - Type - Boolean - Value - 0 - - ClickActionPayEnabled - - Comment - Enable click to pay actions in tool pie menu - Type - Boolean - Value - 0 - - EnableGrab - - Comment - Use Ctrl+mouse to grab and manipulate objects - Type - Boolean - Value - 0 - - EnableMouselook - - Comment - Allow first person perspective and mouse control of camera - Type - Boolean - Value - 0 - - HelpURLFormat - - Comment - URL pattern for help page; arguments will be encoded; see llviewerhelp.cpp:buildHelpURL for arguments - Type - String - Value - http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/howto/index.html?topic=[TOPIC] - - PreferredMaturity - - Comment - Setting for the user's preferred maturity level (consts in indra_constants.h) - Type - U32 - Value - 21 - - RenderTrackerBeacon - - Comment - Display tracking arrow and beacon to target avatar, teleport destination - Type - Boolean - Value - 0 - - ShowScriptErrors - - Comment - Show script errors - Type - Boolean - Value - 0 - - ShowScriptErrorsLocation - - Comment - Show script error in chat or window - Type - S32 - Value - 0 - - SkinCurrent - - Comment - The currently selected skin. - Type - String - Value - minimal - - UseExternalBrowser - - Comment - Use default browser when opening web pages instead of in-world browser. - Type - Boolean - Value - 0 - - VoiceCallsRejectGroup - - Comment - Silently reject all incoming group voice calls. - Type - Boolean - Value - 1 - - VoiceDisableMic - - Comment - Completely disable the ability to open the mic. - Type - Boolean - Value - 0 - - ScriptsCanShowUI - - Comment - Allow LSL calls (such as LLMapDestination) to spawn viewer UI - Persist - 1 - Type - Boolean - Value - 0 - - ChatFontSize - - Comment - Size of chat text in chat console (0 = small, 1 = big, 2 = extra large) - Persist - 1 - Type - S32 - Value - 1 - - AvatarPickerHintTimeout - - Comment - Number of seconds to wait before telling resident about avatar picker. - Persist - 1 - Type - F32 - Value - 0.0 - - RenderShowGroupTitleAll - - Comment - Show group titles in name labels - Persist - 1 - Type - Boolean - Value - 0 - - OpenSidePanelsInFloaters - - Comment - If true, will always open side panel contents in a floater. - Persist - 1 - Type - Boolean - Value - 1 - - AvatarInspectorTooltipDelay - - Comment - Seconds before displaying avatar inspector tooltip - Persist - 1 - Type - F32 - Value - 0.1 - - AFKTimeout - - Comment - - Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never). - Valid values are: 0, 120, 300, 600, 1800 - - Persist - 1 - Type - S32 - Value - 0 - - SLURLTeleportDirectly - - Comment - Clicking on a slurl will teleport you directly instead of opening places panel - Persist - 1 - Type - Boolean - Value - 1 - - EnableClassifieds - - Comment - Enable creation of new classified ads - Persist - 1 - Type - Boolean - Value - 0 - - EnableGroupInfo - - Comment - Enable viewing and editing of group info. - Persist - 1 - Type - Boolean - Value - 0 - - EnablePlaceProfile - - Comment - Enable viewing of place profile from web link - Persist - 1 - Type - Boolean - Value - 0 - - EnablePicks - - Comment - Enable editing of picks - Persist - 1 - Type - Boolean - Value - 0 - - EnableWorldMap - - Comment - Enable opening world map from web link - Persist - 1 - Type - Boolean - Value - 0 - - EnableAvatarPay - - Comment - Enable paying other avatars from web link - Persist - 1 - Type - Boolean - Value - 0 - - EnableVoiceCall - - Comment - Enable voice calls from web link - Persist - 1 - Type - Boolean - Value - 1 - - EnableAvatarShare - - Comment - Enable sharing from web link - Persist - 1 - Type - Boolean - Value - 0 - - EnableInventory - - Comment - Enable opening inventory from web link - Persist - 1 - Type - Boolean - Value - 0 - - EnableSearch - - Comment - Enable opening search from web link - Persist - 1 - Type - Boolean - Value - 0 - - EnableAppearance - - Comment - Enable opening appearance from web link - Persist - 1 - Type - Boolean - Value - 0 - - DoubleClickShowWorldMap - - Comment - Enable double-click to show world map from mini map - Persist - 1 - Type - Boolean - Value - 0 - - EnableGroupChatPopups - - Comment - Enable Incoming Group Chat Popups - Persist - 1 - Type - Boolean - Value - 0 - - SearchFromAddressBar - - Comment - Can enter search queries into navigation address bar - Persist - 1 - Type - Boolean - Value - 0 - - DestinationGuideURL - - Comment - Destination guide contents - Persist - 1 - Type - String - Value - http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/guide.html - - AvatarPickerURL - - Comment - Avatar picker contents - Persist - 1 - Type - String - Value - http://common-flash-secondlife-com.s3.amazonaws.com/viewer/v2.6/agni/avatars.html - - LogInventoryDecline - - Comment - Log in system chat whenever an inventory offer is declined - Persist - 1 - Type - Boolean - Value - 0 - - UseHTTPInventory - - Comment - Allow use of http inventory transfers instead of UDP - Persist - 1 - Type - Boolean - Value - 0 - - ClickToWalk - - Comment - Click in world to walk to location - Persist - 1 - Type - Boolean - Value - 1 - - ShowOfferedInventory - - Comment - Show inventory window with last inventory offer selected when receiving inventory from other users. - Persist - 1 - Type - Boolean - Value - 0 - - OpenIMOnVoice - - Comment - Open the corresponding IM window when connecting to a voice call. - Persist - 1 - Type - Boolean - Value - 1 - - AllowBottomTrayButtonReordering - - Comment - Allow user to move and hide bottom tray buttons - Persist - 1 - Type - Boolean - Value - 0 - - ShowHelpOnFirstLogin - - Comment - Show Help Floater on first login - Persist - 1 - Type - Boolean - Value - 1 - - - -- cgit v1.2.3 From 7bc6e626f40a910b4a3e5b88161e96b9967bd24d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 21 Sep 2011 14:24:38 -0700 Subject: EXP-1207 : LLToolbarView skeleton, nothing operational yet... --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7ab9f36b87..edebbcb8cf 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2652,6 +2652,17 @@ Value -1 + DebugToolbarFUI + + Comment + Turn on the FUI Toolbars + Persist + 1 + Type + Boolean + Value + 1 + DebugViews Comment -- cgit v1.2.3 From 412e29ed9d62e975a5290c6008558a739b88065d Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 21 Sep 2011 17:25:38 -0700 Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars EXP-1232 FIX -- Create class to load and hold all of the command meta data associated with FUI toolbar actions * Added basic commands.xml file to define FUI-related toolbar actions. For now a basic "avatar" and "places" button are defined. * Added basic command manager to parse and hold strings that define potential toolbar command actions. * Broke out a separate floater function as a placeholder for the 3-state toolbar floater toggling. * LLUI::initClass now parses the new commands.xml file Reviewed by Richard. --- indra/newview/app_settings/commands.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 indra/newview/app_settings/commands.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml new file mode 100644 index 0000000000..8e45e866ca --- /dev/null +++ b/indra/newview/app_settings/commands.xml @@ -0,0 +1,17 @@ + + + + + -- cgit v1.2.3 From f72115059e7b1450e221a8006d2030ac35767b5a Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 21 Sep 2011 17:57:49 -0700 Subject: EXP-1230 FIX As a resident, I want to not have to choose a UI mode for existing configs that point to settings_minimal.xml, make it a valid, but empty file --- indra/newview/app_settings/settings_minimal.xml | 1 + 1 file changed, 1 insertion(+) create mode 100644 indra/newview/app_settings/settings_minimal.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml new file mode 100644 index 0000000000..01a70f2671 --- /dev/null +++ b/indra/newview/app_settings/settings_minimal.xml @@ -0,0 +1 @@ + \ No newline at end of file -- cgit v1.2.3 From 65892a01cad5d22403f36a10187af40b37b48383 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 21 Sep 2011 19:31:07 -0700 Subject: EXP-1207 : More work on LLToolbarView, still not operational... --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cc9e17409f..148b80e817 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1858,7 +1858,7 @@ Type Boolean Value - 1 + 0 Cursor3D -- cgit v1.2.3 From f50d28303c28fdccc5f06dcbc1147a9d3223d07f Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 22 Sep 2011 10:05:53 -0700 Subject: Turn curl multithread setting to on by default as it should (mistakenly turned off on my machine to work around mac crasher) --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 148b80e817..cc9e17409f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1858,7 +1858,7 @@ Type Boolean Value - 0 + 1 Cursor3D -- cgit v1.2.3 From 53a8e1299305a4acad83f52401679c86485fcf51 Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Fri, 23 Sep 2011 09:45:28 -0700 Subject: EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars EXP-1233 PROGRESS -- Populate the toybox floater window with all FUI toolbar buttons * Added all documented FUI commands from the wiki, 20 in all, with text, tooltips and placeholder icons. * Note current toolbar checked in toolbar code does not lay these commands out properly. --- indra/newview/app_settings/commands.xml | 126 ++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 8e45e866ca..5cb8ddffcd 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -7,6 +7,83 @@ function="Floater.ToolbarToggle" param="avatar" /> + + + + + + + + + + + + + + + + + + -- cgit v1.2.3