From 981a43b355e44daa7e1b4065b896ea4cd2fec3a2 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Aug 2010 16:13:10 -0400 Subject: Created new wearable type. Added debug setting for disabling physics. Added disable-multiwear and disable-camera-reset to wearabletype. --- indra/newview/app_settings/settings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 07418d1b5e..8310c50b1e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -619,6 +619,19 @@ Value 0 + + AvatarPhysics + + Comment + Enable avatar physics, such as breast physics. + Persist + 1 + Type + Boolean + Value + 1 + + BackgroundYieldTime Comment -- cgit v1.2.3 From 635128f353758e59c1ae158b2f01d291b0cea30f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 26 Aug 2010 11:44:08 -0400 Subject: Added graphics preference setting for physics. --- indra/newview/app_settings/settings.xml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8310c50b1e..d190ac7136 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -607,7 +607,17 @@ Value 10 - + AvatarPhysics + + Comment + Enable avatar physics, such as breast physics. + Persist + 1 + Type + Boolean + Value + 1 + AvatarSex Comment @@ -620,16 +630,16 @@ 0 - AvatarPhysics + RenderAvatarPhysicsLODFactor Comment - Enable avatar physics, such as breast physics. + Controls level of detail of avatar physics (such as breast physics). Persist 1 Type - Boolean + F32 Value - 1 + 1.0 BackgroundYieldTime -- cgit v1.2.3 From a37057717d243596b92108590d56a0d3021ad840 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 26 Aug 2010 14:02:51 -0400 Subject: Miscellaneous fixes for how we're doing graphics settings for the avatar physics. Fixed a cast issue that was causing a linux compile error. --- indra/newview/app_settings/settings.xml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d190ac7136..ecb36273ec 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -630,18 +630,6 @@ 0 - RenderAvatarPhysicsLODFactor - - Comment - Controls level of detail of avatar physics (such as breast physics). - Persist - 1 - Type - F32 - Value - 1.0 - - BackgroundYieldTime Comment @@ -6646,6 +6634,17 @@ Value 12 + RenderAvatarPhysicsLODFactor + + Comment + Controls level of detail of avatar physics (such as breast physics). + Persist + 1 + Type + F32 + Value + 1.0 + RenderAvatarVP Comment -- cgit v1.2.3 From db28075a8db2f1eff8f318688e57ae0c76931508 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 31 Aug 2010 18:06:03 -0400 Subject: Added debug setting for profiling. --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ecb36273ec..58ed998ba0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -610,7 +610,7 @@ AvatarPhysics Comment - Enable avatar physics, such as breast physics. + Enable avatar physics. Persist 1 Type @@ -618,6 +618,17 @@ Value 1 + AvatarPhysicsTest + + Comment + Simulate continuous physics behavior on all nearby avatars. + Persist + 1 + Type + Boolean + Value + 0 + AvatarSex Comment -- cgit v1.2.3 From b5ea8b6046b2634cd0ef0ca2d7c3ac8079529e90 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Mon, 13 Sep 2010 12:39:14 -0600 Subject: for VWR-22936: design test code/plan for the object cache. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b3f6f0c9f8..c83a87f968 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5849,6 +5849,17 @@ Value 0 + ObjectCacheEnabled + + Comment + Enable the object cache. + Persist + 1 + Type + Boolean + Value + 1 + OpenDebugStatAdvanced Comment -- cgit v1.2.3 From fcdd09772f857b7a8ba4cd12d42b23e9dbb6dbf7 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 16 Sep 2010 13:13:06 -0600 Subject: debug code for SH-115: investigate texture related network traffic between viewer 2.x and 1.23. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c83a87f968..e76874e3cb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4548,6 +4548,17 @@ Value 0 + LogTextureNetworkTraffic + + Comment + Log network traffic for textures + Persist + 1 + Type + Boolean + Value + 0 + LoginAsGod Comment -- cgit v1.2.3 From 9b16a05c07372d2d86be0be1b914086984ea5285 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 21 Sep 2010 10:47:59 -0400 Subject: SH-178 FIXED As a non-god, I don't want to see admin options Admin options are now enabled by a debug setting. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 916657b97d..b641a16847 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -24,6 +24,17 @@ Value 300 + AdminMenu + + Comment + Enable the debug admin menu from the main menu. Note: This will just allow the menu to be shown; this does not grant admin privileges. + Persist + 0 + Type + Boolean + Value + 0 + AdvanceSnapshot Comment -- cgit v1.2.3 From 266b3843b75fb9b8da7d2b3c824224a1b94697a5 Mon Sep 17 00:00:00 2001 From: callum Date: Tue, 21 Sep 2010 16:41:06 -0700 Subject: EXP-94 Disable local file system access --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index feb5ebc16d..b28a02551e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4537,6 +4537,17 @@ Value 0 + LocalFileSystemBrowsingEnabled + + Comment + Enable/disable access to the local file system via the file picker + Persist + 1 + Type + Boolean + Value + 1 + LoginSRVTimeout Comment -- cgit v1.2.3 From 7648bb425ae106ce0268c7ff535b054de6f6a318 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 22 Sep 2010 12:25:40 -0700 Subject: EXP-111 WIP Automatically provide default responses to all notifications --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index feb5ebc16d..143574264d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3914,7 +3914,7 @@ Comment Ignore all notifications so we never need user input on them. Persist - 0 + 1 Type Boolean Value -- cgit v1.2.3 From 57b8571a8acd559b7a92c2d5ffbfe96b0c4b5b98 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Fri, 24 Sep 2010 16:17:12 -0700 Subject: Added the VoiceDisableMic debug setting to completely disable the ability to open the mic. Also hoisted PTT key handling from LLVivoxVoiceClient up to LLVoiceClient. This cleans up LLVoiceModuleInterface a bit and makes the PTT logic more centralized. Reviewed by Richard. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9000a9e530..a83291b530 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11366,6 +11366,17 @@ Value 0 + VoiceDisableMic + + Comment + Completely disable the ability to open the mic. + Persist + 1 + Type + Boolean + Value + 0 + VoiceEffectExpiryWarningTime Comment -- cgit v1.2.3 From 5db02993ef806d2d73ae3e3fde89c3405132a348 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Mon, 27 Sep 2010 20:20:09 -0400 Subject: [STORM-255] As a user I would like to disable incoming Group/IM toasts from showing up. This will also take care of STORM-221 since the person that would be affected by the toast cha now disable them. --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 33f5482e50..02e9a10fde 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2567,6 +2567,28 @@ Value 1 + DisableGroupToast + + Comment + Disable Incoming Group Toasts + Persist + 1 + Type + Boolean + Value + 0 + + DisableIMToast + + Comment + Disable Incoming IM Toasts + Persist + 1 + Type + Boolean + Value + 0 + DisplayAvatarAgentTarget Comment -- cgit v1.2.3 From 95ecad54c6f037910a5a22f7ef30026cf628fe80 Mon Sep 17 00:00:00 2001 From: callum Date: Tue, 28 Sep 2010 16:52:56 -0700 Subject: EXP-112 Enable fullscreen mode (with mode switch, not resize to desktop) as per 1.x viewer. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a83291b530..9c19d2c638 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11684,6 +11684,17 @@ Boolean Value 1 + + WindowFullScreen + + Comment + SL viewer window full screen + Persist + 1 + Type + Boolean + Value + 0 WindowHeight -- cgit v1.2.3 From 6c1f89ea6e0d63c59da4e3a33c9252371032b58b Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 28 Sep 2010 17:13:08 -0700 Subject: added settings to toggle grab and alt-zoom ability --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a83291b530..13fed89867 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2820,6 +2820,28 @@ Value 1 + EnableGrab + + Comment + Use Ctrl+mouse to grab and manipulate objects + Persist + 1 + Type + Boolean + Value + 1 + + EnableAltZoom + + Comment + Use Alt+mouse to look at and zoom in on objects + Persist + 1 + Type + Boolean + Value + 1 + EnableRippleWater Comment -- cgit v1.2.3 From cafefd3f5f161d79ecd62bc00b769e6b2b94dc82 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 4 Oct 2010 11:19:37 -0400 Subject: SH-270 FIXED As a SL user, I want my speaker order settings to persist between sessions SH-271 FIXED Add #ifdefs to llparticipantlist.h Changed speaker order to store its speaker ordering using settings.xml. Did some superficial code cleanup. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b641a16847..b67530215b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11079,6 +11079,17 @@ Value 1 + SpeakerParticipantDefaultOrder + + Comment + Order for displaying speakers in voice controls. 0 = alphabetical. 1 = recent. + Persist + 1 + Type + U32 + Value + 1 + SpeakerParticipantRemoveDelay Comment -- cgit v1.2.3 From 033c45f99024dd8197a94936443f67f3e76d40bb Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 4 Oct 2010 11:21:15 -0700 Subject: EXP-142 FIXED Disable mouselook in Skylight --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 18a064c7ba..b24de89103 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2842,6 +2842,17 @@ Value 1 + EnableMouselook + + Comment + Allow first person perspective and mouse control of camera + Persist + 1 + Type + Boolean + Value + 1 + EnableRippleWater Comment -- cgit v1.2.3 From b285fd4d0abf9113fc416c30ac115db06c9f2ebf Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Tue, 5 Oct 2010 16:42:24 -0700 Subject: Fix for EXP-131 "Call dialog shown in locked position when a Resident calls a Skylight visitor" Added the setting VoiceCallsRejectAll, which causes the viewer to silently reject all incoming voice calls. Reviewed by Callum. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 04d1137ac8..09f74e5508 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11410,6 +11410,17 @@ Value 0 + VoiceCallsRejectAll + + Comment + Silently reject all incoming voice calls. + Persist + 1 + Type + Boolean + Value + 0 + VoiceDisableMic Comment -- cgit v1.2.3 From f5b3fc596d029d3ac2f953ee94ea3ae131d00940 Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 6 Oct 2010 15:34:32 -0700 Subject: Add support for debug setting to disable link highlight & follow in URLs that appear in XUI widgets --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 09f74e5508..345a1f3576 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2556,6 +2556,17 @@ Value 0 + DisableTextHyperlinkActions + + Comment + Disable highlighting and linking of URLs in XUI text boxes + Persist + 1 + Type + Boolean + Value + 0 + DisableVerticalSync Comment -- cgit v1.2.3 From f974a019b19a68fee219eb1b4e80d6dc5c5df92e Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Wed, 6 Oct 2010 16:50:04 -0700 Subject: Added DisableExternalBrowser setting. Reviewed by Callum. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 345a1f3576..204097769a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2545,6 +2545,17 @@ Value 0 + DisableExternalBrowser + + Comment + Disable opening an external browser. + Persist + 1 + Type + Boolean + Value + 0 + DisableRendering Comment -- cgit v1.2.3 From 01b28ddf5ddc7118bc8b2047d899aee0293a8721 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Wed, 6 Oct 2010 20:10:36 -0700 Subject: EXP-156 WIP Implement custom Skylight hints --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 204097769a..d5cfc11c2c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12176,7 +12176,7 @@ Type F32 Value - 600.0 + 1200.0 SidePanelHintTimeout -- cgit v1.2.3 From dd2eff8da2b2508d5fc46492147e015d2455f957 Mon Sep 17 00:00:00 2001 From: callum Date: Thu, 7 Oct 2010 12:08:03 -0700 Subject: EXP-167: Quit On Login Page Activated - viewer code /default setting --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d5cfc11c2c..142378b540 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6535,6 +6535,17 @@ Value 0.0 + QuitOnLoginActivated + + Comment + Quit if login page is activated (used when auto login is on and users must not be able to login manually) + Persist + 1 + Type + Boolean + Value + 0 + RadioLandBrushAction Comment -- cgit v1.2.3 From 78f0e65d63950dab8e72be6db0df22064271cfa2 Mon Sep 17 00:00:00 2001 From: callum Date: Fri, 8 Oct 2010 16:18:47 -0700 Subject: EXP-170 Able to buy objects in Skylight viewer (viewer code and default settings changes) Note: this also adds a setting to turn off 'Pay' too. --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 142378b540..f9d930a13a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2699,6 +2699,28 @@ Value 1 + ClickActionBuyEnabled + + Comment + Enable click to buy actions in tool pie menu + Persist + 1 + Type + Boolean + Value + 1 + + ClickActionPayEnabled + + Comment + Enable click to pay actions in tool pie menu + Persist + 1 + Type + Boolean + Value + 1 + DoubleClickAutoPilot Comment -- cgit v1.2.3 From 77d1fa974ad6cc9be0b84e574b455693bfa7f702 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 8 Oct 2010 17:37:38 -0700 Subject: added "FastQuit" option for forceful termination, default is off --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 142378b540..bc06078928 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2962,6 +2962,17 @@ Boolean Value 0 + + FastQuit + + Comment + Quits as quickly as possible, only sending logout request before forcefully terminating. Use with care, as this might result in data corruption or loss. + Persist + 1 + Type + Boolean + Value + 0 FeatureManagerHTTPTable -- cgit v1.2.3 From 092e595b25e3e0cd27c480d864bfd894aaf3c987 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 11 Oct 2010 12:31:00 -0700 Subject: EXP-172 FIXED Property lines flash on and off when right clicking on land in Skylight viewer --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1c7e391ccb..f3dea5b88b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8505,6 +8505,17 @@ Value 512 + RenderParcelSelection + + Comment + Display selected parcel outline + Persist + 1 + Type + Boolean + Value + 1 + RotateRight Comment -- cgit v1.2.3 From 993136fe347075b71f649ec70ce1a463afb073f8 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 12 Oct 2010 08:43:16 -0400 Subject: Initial hooks for web profiles support --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 742a20a849..a7d3b6436d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3854,6 +3854,17 @@ Value 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 + + Comment + URL for Web Profiles + Persist + 0 + Type + String + Value + http://profiles.secondlife.local/[AGENT_NAME] + HighResSnapshot Comment -- cgit v1.2.3 From 58f0e78cb491833440d85e105593bccc2d2aa4ab Mon Sep 17 00:00:00 2001 From: Dave SIMmONs Date: Tue, 12 Oct 2010 13:50:17 -0700 Subject: Initial work on viewer motion interpolation. Changes include: * InterpolationTime and InterpolationPhaseOut values in settings.xml to control new object interpolation code. Use zero to revert to old logic * Viewer motion interpolation lasts InterpolationTime and will start to phase out after InterpolationPhaseOut seconds * Changed LLWorld::getMinAllowedZ() to take a world-position as a parameter * Added LLVOAvatarSelf::resetRegionCrossingTimer() * Actually reset LLVOAvatarSelf::mRegionCrossingTimer so we get sensible timing data for region crossings * LLVOAvatarSelf::updateRegion() will update position value due to region changes Code reviewed by Ambroff * --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 742a20a849..d4dd654bbc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11245,6 +11245,28 @@ Value 1 + InterpolationTime + + Comment + How long to extrapolate object motion after last packet received + Persist + 1 + Type + F32 + Value + 3.0 + + InterpolationPhaseOut + + Comment + Seconds to phase out interpolated motion + Persist + 1 + Type + F32 + Value + 1.0 + VerboseLogs Comment -- cgit v1.2.3 From 867570132f3ff2dc102561e0d0950b0134dd3e53 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 12 Oct 2010 18:47:56 -0700 Subject: removed some unused settings --- indra/newview/app_settings/settings.xml | 187 -------------------------------- 1 file changed, 187 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f3dea5b88b..85cfabb23c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3590,72 +3590,6 @@ Value 0.5 - FontMonospace - - Comment - Name of monospace font that definitely exists (Truetype file name) - Persist - 0 - Type - String - Value - DejaVuSansMono.ttf - - FontSansSerif - - Comment - Name of primary sans-serif font that definitely exists (Truetype file name) - Persist - 0 - Type - String - Value - MtBkLfRg.ttf - - FontSansSerifBundledFallback - - Comment - Name of secondary sans-serif font that definitely exists (Truetype file name) - Persist - 0 - Type - String - Value - DejaVuSansCondensed.ttf - - FontSansSerifBold - - Comment - Name of bold font (Truetype file name) - Persist - 0 - Type - String - Value - MtBdLfRg.ttf - - FontSansSerifFallback - - Comment - Name of sans-serif font (Truetype file name) - Persist - 0 - Type - String - Value - - - FontSansSerifFallbackScale - - Comment - Scale of fallback font relative to huge font (fraction of huge font size) - Persist - 1 - Type - F32 - Value - 1.0 - FontScreenDPI Comment @@ -3667,61 +3601,6 @@ Value 96.0 - FontSizeHuge - - Comment - Size of huge font (points, or 1/72 of an inch) - Persist - 1 - Type - F32 - Value - 16.0 - - FontSizeLarge - - Comment - Size of large font (points, or 1/72 of an inch) - Persist - 1 - Type - F32 - Value - 12.0 - - FontSizeMedium - - Comment - Size of medium font (points, or 1/72 of an inch) - Persist - 1 - Type - F32 - Value - 10.0 - - FontSizeMonospace - - Comment - Size of monospaced font (points, or 1/72 of an inch) - Persist - 1 - Type - F32 - Value - 8.1 - - FontSizeSmall - - Comment - Size of small font (points, or 1/72 of an inch) - Persist - 1 - Type - F32 - Value - 9.0 - ForceAssetFail Comment @@ -5252,61 +5131,6 @@ Value 60.0 - MeanCollisionBump - - Comment - You have experienced an abuse of being bumped by an object or avatar - Persist - 1 - Type - Boolean - Value - 0 - - MeanCollisionPhysical - - Comment - You have experienced an abuse from a physical object - Persist - 1 - Type - Boolean - Value - 0 - - MeanCollisionPushObject - - Comment - You have experienced an abuse of being pushed by a scripted object - Persist - 1 - Type - Boolean - Value - 0 - - MeanCollisionScripted - - Comment - You have experienced an abuse from a scripted object - Persist - 1 - Type - Boolean - Value - 0 - - MeanCollisionSelected - - Comment - You have experienced an abuse of being pushed via a selected object - Persist - 1 - Type - Boolean - Value - 0 - MediaControlFadeTime Comment @@ -7836,17 +7660,6 @@ Value 1 - RenderFastUI - - Comment - [NOT USED] - Persist - 1 - Type - Boolean - Value - 0 - RenderFlexTimeFactor Comment -- cgit v1.2.3 From fa20a3fe100bd2c99b6fe4c087c79268752a107c Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 13 Oct 2010 17:05:53 -0400 Subject: SH-325 FIXED Add terminal / to SearchURL in viewer settings.xml Added "/". Simple fix. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 47524a0e91..535bc95287 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3863,7 +3863,7 @@ Type String Value - 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] + 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] HighResSnapshot -- cgit v1.2.3 From 73b39c9b46ed25ae03b8225758c15325e50fdfe2 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 13 Oct 2010 18:41:35 -0700 Subject: made destination guide url configurable on command line --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 85cfabb23c..5c54b88927 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2523,7 +2523,18 @@ Value 10 - DisableCameraConstraints + DestinationGuideURL + + Comment + Destination guide contents + Persist + 1 + Type + String + Value + http://www.secondlife.com + + DisableCameraConstraints Comment Disable the normal bounds put on the camera by avatar position -- cgit v1.2.3 From 8b9b7fed7367eeb7b055f7b2a44a37539634045e Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 14 Oct 2010 13:31:54 -0700 Subject: removed fastquit --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5c54b88927..f8bd6fa3b9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2995,17 +2995,6 @@ Boolean Value 0 - - FastQuit - - Comment - Quits as quickly as possible, only sending logout request before forcefully terminating. Use with care, as this might result in data corruption or loss. - Persist - 1 - Type - Boolean - Value - 0 FeatureManagerHTTPTable -- cgit v1.2.3 From eea2b8f9d3fe909befd43ca8db7878855ddd661d Mon Sep 17 00:00:00 2001 From: callum Date: Thu, 14 Oct 2010 15:18:00 -0700 Subject: EXP-225 FIX Add debug setting to quit the viewer after N seconds of AFK behavior. Viewer specific setting for this feature including default value in settings file --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5c54b88927..7538b152c1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6403,6 +6403,17 @@ Value 0.0 + QuitAfterSecondsOfAFK + + Comment + The duration allowed after being AFK before quitting. + Persist + 1 + Type + F32 + Value + 0.0 + QuitOnLoginActivated Comment -- cgit v1.2.3 From 6dcf769ca5c8bef9a170451094f022ac3791f1d9 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 15 Oct 2010 14:05:27 -0700 Subject: added schema to settings.xml --- indra/newview/app_settings/settings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 36ac7ecf99..37e1db20ff 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1,5 +1,6 @@ - + CrashHostUrl -- cgit v1.2.3 From 97101982de2b434582a795e7d81c32010bed9c13 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 18 Oct 2010 17:24:49 -0700 Subject: EXP-250 FIX Option to disable beacons --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 37e1db20ff..f316909990 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8154,6 +8154,17 @@ Value 1.0 + RenderTrackerBeacon + + Comment + Display tracking arrow and beacon to target avatar/teleport destination + Persist + 1 + Type + Boolean + Value + 1 + RenderTreeLODFactor Comment -- cgit v1.2.3 From 548f2e92ffd8e971c379860c77d76f1b26313ee5 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 18 Oct 2010 17:34:30 -0700 Subject: EXP-250 FIX Option to disable beacons hud arrow also controlled by RenderTrackerBeacon setting --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f316909990..7788d6b2a0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8155,9 +8155,9 @@ 1.0 RenderTrackerBeacon - + Comment - Display tracking arrow and beacon to target avatar/teleport destination + Display tracking arrow and beacon to target avatar, teleport destination Persist 1 Type -- cgit v1.2.3 From a2009170c92ecb56cf304447dbedfeef74272c0d Mon Sep 17 00:00:00 2001 From: callum Date: Tue, 19 Oct 2010 14:06:23 -0700 Subject: EXP-258 FIX Help url is overwritten by login.cgi Settings have to be persistent otherwise the layering mechanism doesn't work --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7788d6b2a0..f53c060c1f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3794,7 +3794,7 @@ Comment URL pattern for help page; arguments will be encoded; see llviewerhelp.cpp:buildHelpURL for arguments Persist - 0 + 1 Type String Value -- cgit v1.2.3 From 9c09665885783ca9a1405529942912aecca4d938 Mon Sep 17 00:00:00 2001 From: Andrew Productengine Date: Thu, 21 Oct 2010 21:11:29 +0300 Subject: STORM-322 FIXED Fixed problem with redundant search entries shown in People/Groups/Roles/Members. Bug was caused by adding members with uncached names to search results- when name was uncached, method that added ids to member list, didn't respect the filter. - Fixed by adding members only when their names are cached and match the filter. If name is not cached, LLCacheName::get() is called for such user id, and when name is cached, it calls function that handles adding of user to list depending on filter. - Added default sorting of members by name, added saving of sort order to settings. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 33f5482e50..3078e4275b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12145,5 +12145,16 @@ Value 300.0 + GroupMembersSortOrder + + Comment + The order by which group members will be sorted (name|donated|online) + Persist + 1 + Type + String + Value + name + -- cgit v1.2.3 From e7b2c475d898a90c9e1c458cfbffbe15aacc7ad0 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Thu, 21 Oct 2010 14:50:31 -0400 Subject: SH-325 FIXED Add terminal / to SerachURL in viewer settings.xml Trivial fix to add "/" to the search string. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 33f5482e50..086d73bc00 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3863,7 +3863,7 @@ Type String Value - 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] + 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] HighResSnapshot -- cgit v1.2.3 From e638204dc2d8b409f17f7cdf8938deb97d137dbc Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 21 Oct 2010 17:14:14 -0700 Subject: EXP-273 WIP added avatar picker popup and hint --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f53c060c1f..f23b57e62c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12069,6 +12069,17 @@ Value 1200.0 + AvatarPickerHintTimeout + + Comment + Number of seconds to wait before telling resident about avatar picker. + Persist + 1 + Type + F32 + Value + 600.0 + SidePanelHintTimeout Comment -- cgit v1.2.3 From 20e9dbf40b0c3e4ef9674adbaca255723a412959 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 22 Oct 2010 18:37:40 -0700 Subject: EXP-273 FIXED Add button/tray for avatar picker made "toggleable" radio group --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f23b57e62c..a06e1ff384 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -586,6 +586,17 @@ Value 2 + AvatarPickerURL + + Comment + Avatar picker contents + Persist + 1 + Type + String + Value + http://interest.secondlife.com/viewer/avatar + AvatarBakedTextureUploadTimeout Comment -- cgit v1.2.3 From 6da1e54e6a8b66a2cad7c8c89de279ca5b9ac7dd Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Mon, 25 Oct 2010 11:43:50 -0400 Subject: Inverting settings and test so that telling other how to turn off the messages popping is easier as per discussion with Oz and Boroondas also correcting some minor spelling issues --- indra/newview/app_settings/settings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3015dc523a..8ec812d59e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2567,27 +2567,27 @@ Value 1 - DisableGroupToast + EnableGroupToast Comment - Disable Incoming Group Toasts + Enable Incoming Group Toasts Persist 1 Type Boolean Value - 0 + 1 - DisableIMToast + EnableIMToast Comment - Disable Incoming IM Toasts + Enable Incoming IM Toasts Persist 1 Type Boolean Value - 0 + 1 DisplayAvatarAgentTarget -- cgit v1.2.3 From c47365480ccd6daf09c5e6f1f0672f5e0c42fadc Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 25 Oct 2010 18:33:06 -0700 Subject: EXP-322 FIXED Able spawn World map in Skylight Viewer with llMapDestination function --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a06e1ff384..92aa6db3f8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8451,6 +8451,17 @@ Value 0 + ScriptsCanShowUI + + Comment + Allow LSL calls (such as LLMapDestination) to spawn viewer UI + Persist + 1 + Type + Boolean + Value + 1 + SecondLifeEnterprise Comment -- cgit v1.2.3 From 85e1a9bf928f493587bb270cb39d9afd7e379a3a Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 26 Oct 2010 12:38:18 -0700 Subject: EXP-299 WIP Pass end-user IP and MAC from Gaikai to login.cgi --- indra/newview/app_settings/settings.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 92aa6db3f8..1d58766b37 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3855,6 +3855,17 @@ Value 0 + HostID + + Comment + Machine identifier for hosted Second Life instances + Persist + 0 + Type + String + Value + + HtmlHelpLastPage Comment @@ -11983,6 +11994,7 @@ Comment Maximum texture width for user uploaded textures Persist + 1 Type S32 Value -- cgit v1.2.3 From 379f9b824087a44f7ffab0becfafaa29611751be Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Wed, 27 Oct 2010 11:00:39 -0400 Subject: Made changes to setting names and in pannel_preferences_chat.xml for better understanding as per Esbee's comments in STORM-255 --- indra/newview/app_settings/settings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8ec812d59e..e5656c0877 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2567,10 +2567,10 @@ Value 1 - EnableGroupToast + EnableGroupChatPopups Comment - Enable Incoming Group Toasts + Enable Incoming Group Chat Popups Persist 1 Type @@ -2578,10 +2578,10 @@ Value 1 - EnableIMToast + EnableIMChatPopups Comment - Enable Incoming IM Toasts + Enable Incoming IM Chat Popups Persist 1 Type -- cgit v1.2.3 From be8c9fc21758bcbc1d9f3d565b221310344231bd Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Wed, 27 Oct 2010 17:07:31 -0700 Subject: CHOP-122 Initializing Facade service in the viewer. Rev. by Brad. --- indra/newview/app_settings/settings.xml | 35 ++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 086d73bc00..371326c0f5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10991,7 +10991,40 @@ Value 15 - UploadBakedTexOld + UpdaterServiceActive + + Comment + Enable or disable the updater service. + Persist + 1 + Type + Boolean + Value + 1 + + UpdaterServiceCheckPeriod + + Comment + Default period between update checking. + Persist + 1 + Type + U32 + Value + 3600 + + UpdaterServiceURL + + Comment + Default location for the updater service. + Persist + 0 + Type + String + Value + http://secondlife.com/app/update + + UploadBakedTexOld Comment Forces the baked texture pipeline to upload using the old method. -- cgit v1.2.3 From 609f5bd6810ca16a409f209610e6fac972348cba Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 29 Oct 2010 11:20:54 -0700 Subject: added periodic retry to look for updates --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 371326c0f5..5b9bfd0f9c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11011,7 +11011,7 @@ Type U32 Value - 3600 + 10 UpdaterServiceURL @@ -11022,7 +11022,7 @@ Type String Value - http://secondlife.com/app/update + http://localhost/agni UploadBakedTexOld -- cgit v1.2.3 From 064a8d079917ecd91bd6b47f5f7f353989594593 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 29 Oct 2010 11:22:07 -0700 Subject: restore 1hr polling frequency --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5b9bfd0f9c..274c7fbeb8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11011,7 +11011,7 @@ Type U32 Value - 10 + 3600 UpdaterServiceURL -- cgit v1.2.3 From 6ab2e44e945ddc085a7b4b5f1524de924419a897 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Mon, 1 Nov 2010 15:18:18 -0700 Subject: VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() and unit tests. Reviewed by brad. --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 371326c0f5..96d4fb1295 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11344,17 +11344,6 @@ Value 0 - VersionChannelName - - Comment - Versioning Channel Name. - Persist - 0 - Type - String - Value - Second Life Release - VertexShaderEnable Comment -- cgit v1.2.3 From 89f191cd68c54f1d6f46d7d8d4011df180c9de8d Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 3 Nov 2010 12:10:45 -0500 Subject: SH-281 Make UI in snapshot off by default. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 23b6edc321..33c6c939d4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8316,7 +8316,7 @@ Type Boolean Value - 1 + 0 RenderUIBuffer -- cgit v1.2.3 From dfeb7abe5f690bbd3a908c84c53bbea20a5adb7c Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 4 Nov 2010 14:08:14 -0700 Subject: checker working with v1.0 update protocol. --- indra/newview/app_settings/settings.xml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8f5cb7c709..cc0e0a78db 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11022,7 +11022,29 @@ Type String Value - http://localhost/agni + http://update.secondlife.com + + UpdaterServicePath + + Comment + Path on the update server host. + Persist + 0 + Type + String + Value + update + + UpdaterServiceProtocolVersion + + Comment + The update protocol version to use. + Persist + 0 + Type + String + Value + v1.0 UploadBakedTexOld -- cgit v1.2.3 From ab42f31608a2abc0982119d6aebdb0972d41427f Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 5 Nov 2010 14:30:09 -0400 Subject: SH-410 Opaque Water Project version 2.0 First implementation with UI changes. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3f23fee865..7b3f50e4e2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8318,6 +8318,17 @@ Value 1.0 + RenderTransparentWater + + Comment + Render water as transparent. Setting to false renders water as opaque with a simple texture applied. + Persist + 1 + Type + Boolean + Value + 1 + RenderTreeLODFactor Comment -- cgit v1.2.3 From ce613ce398c3430beab13be6a8016e4c8f5dcab1 Mon Sep 17 00:00:00 2001 From: callum Date: Fri, 5 Nov 2010 17:06:21 -0700 Subject: EXP-378 FIX Disable SSL cert errors in LLQtWebkit for testing purposes (Monroe's code - I made a patch and copied it over from viewer-skylight branch) --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3f23fee865..96aadba7cc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -663,6 +663,17 @@ Value http://www.secondlife.com + BrowserIgnoreSSLCertErrors + + Comment + FOR TESTING ONLY: Tell the built-in web browser to ignore SSL cert errors. + Persist + 1 + Type + Boolean + Value + 0 + BlockAvatarAppearanceMessages Comment -- cgit v1.2.3 From 00bd5906a69d3b0723645c3252721d7d6a808b70 Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Tue, 9 Nov 2010 18:54:00 +0200 Subject: STORM-535 FIXED PLEASE allow adjustable transparency of "Nearby Chat" window, Chat History and Chat "Toasts" in Viewer 2.0! - Added to the settings.xml values of transparency for active and inactive floaters - Added three members to the LLFloater. These members store current transparency of floater, transparency of active and inactive floaters. - Added callbacks that update transparency value of active and inactive floater. Also in these callbacks value of current floater transparency updated. - In panel preferences advanced added two spinners: transparency of active floaters and inactive ones. See screenshot. --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 097fdfbb99..ebd93b5987 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -35,6 +35,17 @@ Value 0 + ActiveFloaterTransparency + + Comment + Transparency of active floaters (floaters that have focus) + Persist + 1 + Type + F32 + Value + 0.95 + AdvanceSnapshot Comment @@ -3986,6 +3997,17 @@ Value 1 + InactiveFloaterTransparency + + Comment + Transparency of inactive floaters (floaters that have no focus) + Persist + 1 + Type + F32 + Value + 0.5 + InBandwidth Comment -- cgit v1.2.3 From b2fcba25c8dd04318420af30f877b0984a524055 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Sat, 13 Nov 2010 00:53:29 +0200 Subject: STORM-52 FIXED Made it possible to use an external script editor. The editor can be specified: * via "ExternalEditor" setting in settings.xml * via LL_SCRIPT_EDITOR variable Removed obsolete XUIEditor setting in favor of the new one. --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ebd93b5987..a5d9bd0f4f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11883,10 +11883,10 @@ Value 150000.0 - XUIEditor + ExternalEditor Comment - Path to program used to edit XUI files + Path to program used to edit LSL scripts and XUI files, e.g.: /usr/bin/gedit --new-window "%s" Persist 1 Type -- cgit v1.2.3 From f0a0831954475a2f49fe7473046f0ba657fb2405 Mon Sep 17 00:00:00 2001 From: Andrew Productengine Date: Thu, 18 Nov 2010 23:09:05 +0200 Subject: STORM-560 FIXED Implemented preference that allows users to select default behavior when pressing letter keys. - Added check to LLViewerWindow::handleKey() that gives focus to nearby chat if "Pressing letter keys starts local chat" option is selected, key is not special (and no modifier key is held except Shift), camera is not in mouselook and no view currently has keyboard focus. - The choice of what should happen when letter keys are pressed is saved in new setting added in this fix- "LetterKeysFocusChatBar". --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 561456c9d6..51e3b4e7c8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1365,6 +1365,17 @@ Value 1 + LetterKeysFocusChatBar + + Comment + When printable characters keys (possibly with Shift held) are pressed, the chatbar takes focus + Persist + 1 + Type + S32 + Value + 0 + ChatBubbleOpacity Comment -- cgit v1.2.3 From 05b7ee4a9bb762f484156f1bf3dfa602030f7942 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Mon, 29 Nov 2010 17:00:28 -0800 Subject: Fix UpdaterServiceURL setting default. update.secondlife.com requires https access. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0f946b0f0b..7dbb375a20 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11121,7 +11121,7 @@ Type String Value - http://update.secondlife.com + https://update.secondlife.com UpdaterServicePath -- cgit v1.2.3 From 1345cbb0ca715de8bc98a1ccffd93f29d749500a Mon Sep 17 00:00:00 2001 From: callum Date: Tue, 30 Nov 2010 14:07:16 -0800 Subject: SOCIAL-299 FIX Add *.lindenlab.com to trusted certificate authorities in WebKit Reviewed by CB --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b278932c7c..ef45eaa1db 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -685,6 +685,28 @@ Value 0 + BrowserUseDefaultCAFile + + Comment + Tell the built-in web browser to use the CA.pem file shipped with the client. + Persist + 1 + Type + Boolean + Value + 1 + + BrowserCAFilePath + + Comment + Tell the built-in web browser the path to an alternative CA.pem file (only used if BrowserUseDefaultCAFile is false). + Persist + 1 + Type + String + Value + + BlockAvatarAppearanceMessages Comment -- cgit v1.2.3 From 88eabbd0776ed0c2ce923b23cda14b9f91445aa4 Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 1 Dec 2010 19:02:53 -0800 Subject: SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be useful for viewer web apps Latest traunch of fixes to new Web only content floater Also removed line in test app that fails to build - have a note to fix later --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ef45eaa1db..5548abc623 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6626,7 +6626,18 @@ MediaBrowserWindowLimit Comment - Maximum number of media brower windows that can be open at once (0 for no limit) + Maximum number of media brower windows that can be open at once in the media browser floater (0 for no limit) + Persist + 1 + Type + S32 + Value + 5 + + WebContentWindowLimit + + Comment + Maximum number of web brower windows that can be open at once in the Web content floater (0 for no limit) Persist 1 Type -- cgit v1.2.3 From 9e67a2d71030db4e2f54084e141d36a44ebbb37c Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 3 Dec 2010 12:02:41 +0200 Subject: STORM-544 ADDITIONAL FIX Set default transparency for inactive floaters to 65%. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0f946b0f0b..bf8e1f47f6 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4017,7 +4017,7 @@ Type F32 Value - 0.5 + 0.65 InBandwidth -- cgit v1.2.3 From 337f95f8b92d5efd0aaf4e955244ddbeae437bf1 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 7 Dec 2010 16:20:19 -0800 Subject: lamo programmer ui for setting downloader bandwidth limit. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7dbb375a20..33a48164b0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9990,6 +9990,17 @@ Value 500.0 + UpdaterMaximumBandwidth + + Comment + Maximum allowable downstream bandwidth for updater service (kilo bits per second) + Persist + 1 + Type + F32 + Value + 500.0 + ToolTipDelay Comment -- cgit v1.2.3 From 519cf939d90e67acab808a63f5788e14c1d8bc8a Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 9 Dec 2010 12:49:34 +0200 Subject: STORM-728 FIXED Fixed crash when choosing to send snapshot by email in mouselook mode. - Fixed dereferencing a NULL pointer. - Added EMAIL SNAPSHOT floater to the list of floaters allowed in mouselook mode. --- indra/newview/app_settings/settings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 402a0e85c4..ed67a87024 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12241,6 +12241,7 @@ Value snapshot + postcard mini_map -- cgit v1.2.3 From 9a3f6c1e0cb690201f91f21e3be393bace827604 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 9 Dec 2010 12:49:51 -0800 Subject: change updater settings from check box to drop down menu; add choice of whether to install automatically as well as download automatically (not actually implemented yet). --- indra/newview/app_settings/settings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 33a48164b0..5d89051c45 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11101,16 +11101,16 @@ Value 15 - UpdaterServiceActive + UpdaterServiceSetting Comment - Enable or disable the updater service. + Configure updater service. Persist 1 Type - Boolean + U32 Value - 1 + 3 UpdaterServiceCheckPeriod -- cgit v1.2.3 From 36207fcf1a16c66a5b831af31e524fc44060c2c8 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 20 Dec 2010 12:59:17 -0800 Subject: STORM-805 : Fix the map URL --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 06992d2b52..2bb192474b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4747,6 +4747,17 @@ Value http://map.secondlife.com.s3.amazonaws.com/ + CurrentMapServerURL + + Comment + Current Session World map URL + Persist + 0 + Type + String + Value + + MapShowEvents Comment -- cgit v1.2.3 From 4d296c19e55b779051984d8d4dd3df780e768317 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Mon, 27 Dec 2010 21:47:06 +0200 Subject: STORM-242 FIXED Fixed incorrect release notes URL in the "You just entered a region using a different server version" notification. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b3324ea6c6..0ca4272b23 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12423,5 +12423,16 @@ Value name + ReleaseNotesURL + + Comment + Release notes URL template + Persist + 1 + Type + String + Value + http://secondlife.com/app/releasenotes/?channel=[CHANNEL]&version=[VERSION] + -- cgit v1.2.3 From cd2cb1475fc342a528583ba739375ce4cc44392a Mon Sep 17 00:00:00 2001 From: callum Date: Wed, 29 Dec 2010 13:37:46 -0800 Subject: SOCIAL-401 FIX Change default web profiles URL to something closer to what will be released --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 10c8904b6a..431331bc0f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3941,7 +3941,7 @@ Type String Value - http://profiles.secondlife.local/[AGENT_NAME] + https://my.secondlife.com/[AGENT_NAME] HighResSnapshot @@ -3950,7 +3950,7 @@ Persist 1 Type - Boolean + Boolean Value 0 -- cgit v1.2.3 From fd95de0e79dfea96f9c3073685dc0bad8cfe39e9 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Tue, 18 Jan 2011 18:46:35 +0200 Subject: STORM-243 FIXED Disabled the "You just entered a region using a different server version..." pop-up notification. --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ef6f8fd3ee..a22f197b85 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12445,16 +12445,5 @@ Value name - ReleaseNotesURL - - Comment - Release notes URL template - Persist - 1 - Type - String - Value - http://secondlife.com/app/releasenotes/?channel=[CHANNEL]&version=[VERSION] - -- cgit v1.2.3 From feb5fbc66e0a4941489a7c0d92cb51341a1c4f39 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 18 Jan 2011 10:41:37 -0700 Subject: debug tool to show texture info for SH-659: small textures not loaded. --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7b3f50e4e2..c7302ea607 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1851,10 +1851,21 @@ Value 0 + DebugShowTextureInfo + + Comment + Show inertested texture info + Persist + 1 + Type + Boolean + Value + 0 + DebugShowTime Comment - Show depth buffer contents + Show time info Persist 1 Type -- cgit v1.2.3 From 3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 19 Jan 2011 06:02:08 -0500 Subject: STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, formatting cleanup --- indra/newview/app_settings/settings.xml | 81 +-------------------------------- 1 file changed, 1 insertion(+), 80 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 06992d2b52..ec094eaeb8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -917,39 +917,6 @@ Value 1 - BulkChangeIncludeAnimations - - Comment - Bulk permission changes affect animations - Persist - 1 - Type - Boolean - Value - 1 - - BulkChangeIncludeAnimations - - Comment - Bulk permission changes affect animations - Persist - 1 - Type - Boolean - Value - 1 - - BulkChangeIncludeAnimations - - Comment - Bulk permission changes affect animations - Persist - 1 - Type - Boolean - Value - 1 - BulkChangeIncludeBodyParts Comment @@ -1162,18 +1129,7 @@ CacheLocationTopFolder Comment - Controls the top folder location of the local disk cache - Persist - 1 - Type - String - Value - - - CacheLocationTopFolder - - Comment - Controls the location of the local disk cache + Controls the top folder location of the the local disk cache Persist 1 Type @@ -3085,17 +3041,6 @@ Value http://viewer-settings.secondlife.com - FPSLogFrequency - - Comment - Seconds between display of FPS in log (0 for never) - Persist - 1 - Type - F32 - Value - 60.0 - FPSLogFrequency Comment @@ -6027,17 +5972,6 @@ 0 OutBandwidth - - Comment - Expand render stats display - Persist - 1 - Type - Boolean - Value - 1 - - OutBandwidth Comment Outgoing bandwidth throttle (bps) @@ -11375,8 +11309,6 @@ Type LLSD Value - - VFSOldSize @@ -11532,17 +11464,6 @@ Value - VivoxDebugSIPURIHostName - - Comment - Hostname portion of vivox SIP URIs (empty string for the default). - Persist - 1 - Type - String - Value - - VivoxDebugVoiceAccountServerURI Comment -- cgit v1.2.3 From 2a14079563ce323452a8088cca994e4f5c0edcd4 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Mon, 24 Jan 2011 15:50:46 -0700 Subject: fix for SH-445: debug settings -> "CacheNumberOfRegionsForObjects" does not limit the number of object cache files --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 819808ec40..ced46c7294 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1179,7 +1179,7 @@ Type U32 Value - 20000 + 128 CacheSize -- cgit v1.2.3 From 8f54dc2958e75587165623b0292940200fb49f59 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 26 Jan 2011 11:13:04 -0700 Subject: for SH-846: design and implement the debug code to locate memory leaking --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ced46c7294..72d83ad024 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1852,6 +1852,17 @@ Value 0 + DebugShowMemory + + Comment + Show Total Allocated Memory + Persist + 1 + Type + Boolean + Value + 0 + DebugShowRenderInfo Comment -- cgit v1.2.3 From 91f3c204b51adf9ac1775716dc20fb9d82a8c13c Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 28 Jan 2011 16:04:32 +0200 Subject: STORM-610 FIXED Changes to water color and density in the Environment Editor now persist between sessions. However they get overriden when you switch water presets in the Advanced Water floater. --- indra/newview/app_settings/settings.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ced46c7294..7a2f3f815d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11860,6 +11860,33 @@ Value 0 + WaterFogColor + + Comment + Water fog color + Persist + 1 + Type + Color4 + Value + + 22 + 43 + 54 + 0 + + + WaterFogDensity + + Comment + Water fog density + Persist + 1 + Type + F32 + Value + 16.0 + WaterGLFogDensityScale Comment -- cgit v1.2.3 From 38dceba9b4a1faa386d377a20080a590ea20cbdb Mon Sep 17 00:00:00 2001 From: callum Date: Fri, 28 Jan 2011 11:17:18 -0800 Subject: STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7 Also removed refs to debug vars used to specify location of pem file --- indra/newview/app_settings/settings.xml | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ef6f8fd3ee..ca587302b2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -697,28 +697,6 @@ Value 0 - BrowserUseDefaultCAFile - - Comment - Tell the built-in web browser to use the CA.pem file shipped with the client. - Persist - 1 - Type - Boolean - Value - 1 - - BrowserCAFilePath - - Comment - Tell the built-in web browser the path to an alternative CA.pem file (only used if BrowserUseDefaultCAFile is false). - Persist - 1 - Type - String - Value - - BlockAvatarAppearanceMessages Comment -- cgit v1.2.3 From 09b009fc23e75c8403cc9879f7f839d9e2656c02 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 4 Feb 2011 16:38:26 -0800 Subject: STORM-610 : Backing out that change (test fail) --- indra/newview/app_settings/settings.xml | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8bb60267da..6630d8f400 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11849,33 +11849,6 @@ Value 0 - WaterFogColor - - Comment - Water fog color - Persist - 1 - Type - Color4 - Value - - 22 - 43 - 54 - 0 - - - WaterFogDensity - - Comment - Water fog density - Persist - 1 - Type - F32 - Value - 16.0 - WaterGLFogDensityScale Comment -- cgit v1.2.3 From f13884e528c327dbbc638b72322e08b544d0f6c0 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 15 Feb 2011 14:12:58 -0700 Subject: partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6630d8f400..58abd4c091 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8451,6 +8451,17 @@ Value 1 + RenderVBOMappingDisable + + Comment + Disable VBO glMapBufferARB + Persist + 1 + Type + Boolean + Value + 0 + RenderUseStreamVBO Comment -- cgit v1.2.3 From 2ebcf802cbec59b4d9fe404af5bd125818d4eefa Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 22 Feb 2011 13:28:48 -0700 Subject: set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 58abd4c091..a010524091 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8460,7 +8460,7 @@ Type Boolean Value - 0 + 1 RenderUseStreamVBO -- cgit v1.2.3 From 5aa43e4f3e30d81fb518783189b3258e67b4620a Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 22 Feb 2011 19:30:50 -0800 Subject: SOCIAL-545 WIP Figure out how to configure skylight-specific settings while retaining relevant user settings (login account name, etc.) converted settings_file.xml to use param block descriptions for easier modification added session settings file and user session settings file for per-session config overrides --- indra/newview/app_settings/settings.xml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6630d8f400..1bcc988e5c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11473,7 +11473,7 @@ Type F32 Value - 3.0 + 3 InterpolationPhaseOut @@ -11484,7 +11484,7 @@ Type F32 Value - 1.0 + 1 VerboseLogs @@ -12366,5 +12366,27 @@ Value name + SessionSettingsFile + + Comment + Settings that are a applied per session (not saved). + Persist + 0 + Type + String + Value + + + UserSessionSettingsFile + + Comment + User settings that are a applied per session (not saved). + Persist + 0 + Type + String + Value + + -- cgit v1.2.3 From 668307e4e3b59ac4f4f955aa0d36183c361352b8 Mon Sep 17 00:00:00 2001 From: Robin Cornelius Date: Wed, 23 Feb 2011 15:50:55 -0500 Subject: STORM-1019 Add ability to display beacons for Media on a Prim objects Changes merged into viewer 2 by Jonathan Yap --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a010524091..d8b23d9d88 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12069,6 +12069,17 @@ Value 0.40000000596 + moapbeacon + + Comment + Beacon / Highlight media on a prim sources + Persist + 1 + Type + Boolean + Value + 0 + particlesbeacon Comment -- cgit v1.2.3 From f6f392babea8bbf748587c3a8ffe99e598b1a7df Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 23 Feb 2011 16:36:55 -0800 Subject: SOCIAL-545 FIX Figure out how to configure skylight-specific settings sessionsettingsfile and usersessionsettingsfile are allowed to persist, so we can change them from the login screen --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1bcc988e5c..0d7437ed1c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12371,7 +12371,7 @@ Comment Settings that are a applied per session (not saved). Persist - 0 + 1 Type String Value @@ -12382,7 +12382,7 @@ Comment User settings that are a applied per session (not saved). Persist - 0 + 1 Type String Value -- cgit v1.2.3 From 8be54fc52ee5970d21388447fe699454f38baf20 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 24 Feb 2011 18:33:57 -0800 Subject: SOCIAL-551 WIP add buttons to open people and profile windows added option OpenSidePanelsInFloaters to always undock side panel content also set default configuration to basic --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0d7437ed1c..71ff7177ee 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12375,7 +12375,7 @@ Type String Value - + settings_minimal.xml UserSessionSettingsFile @@ -12388,5 +12388,16 @@ Value + OpenSidePanelsInFloaters + + Comment + If true, will always open side panel contents in a floater. + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From fabf9607af47ead8530d0feff41effb9736d0120 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 25 Feb 2011 15:44:31 -0800 Subject: SOCIAL-548 FIX shorten delay for avatar inspector tooltips --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 71ff7177ee..162c479398 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12399,5 +12399,27 @@ Value 0 + AvatarInspectorTooltipDelay + + Comment + Seconds before displaying avatar inspector tooltip + Persist + 1 + Type + F32 + Value + 0.35 + + ObjectInspectorTooltipDelay + + Comment + Seconds before displaying object inspector tooltip + Persist + 1 + Type + F32 + Value + 0.35 + -- cgit v1.2.3 From f9301bb10f8845db45e1f8b2098d072b8db4d90a Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 28 Feb 2011 17:37:09 -0800 Subject: SOCIAL-558 FIX clicking on slurl hyperlink should teleport instead of showing place panel --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 162c479398..1af7e31a34 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12421,5 +12421,16 @@ Value 0.35 + SLURLTeleportDirectly + + Comment + Clicking on a slurl will teleport you directly instead of opening places panel + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From 903b3ab35d67eec1b780b0e9f7407f7c47544ea9 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 28 Feb 2011 17:38:35 -0800 Subject: SOCIAL-601 FIX avatar picker hint --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1af7e31a34..ee1d5b140f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12333,17 +12333,6 @@ Value 1200.0 - AvatarPickerHintTimeout - - Comment - Number of seconds to wait before telling resident about avatar picker. - Persist - 1 - Type - F32 - Value - 600.0 - SidePanelHintTimeout Comment -- cgit v1.2.3 From e02b83c350d9b642baa610829098539f18efa651 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 28 Feb 2011 22:06:21 -0800 Subject: SOCIAL-608 WIP Classified link is available in Basic mode --- indra/newview/app_settings/settings.xml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ee1d5b140f..011a57c656 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12421,5 +12421,38 @@ Value 0 + EnableClassifieds + + Comment + Enable creation of new classified ads + Persist + 1 + Type + Boolean + Value + 1 + + EnableGroupInfo + + Comment + Enable viewing and editing of group info. + Persist + 1 + Type + Boolean + Value + 1 + + EnablePicks + + Comment + Enable editing of picks + Persist + 1 + Type + Boolean + Value + 1 + -- cgit v1.2.3 From a10cdd9d57db3a1f44a22d987e2349d2bb0f4808 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 1 Mar 2011 11:20:40 -0800 Subject: updated destination guide and avatar picker urls --- indra/newview/app_settings/settings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 011a57c656..b71b9d06ff 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -617,7 +617,7 @@ Type String Value - http://interest.secondlife.com/viewer/avatar + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/avatars.html AvatarBakedTextureUploadTimeout @@ -2566,7 +2566,7 @@ Type String Value - http://www.secondlife.com + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/guide.html DisableCameraConstraints @@ -12364,7 +12364,7 @@ Type String Value - settings_minimal.xml + UserSessionSettingsFile -- cgit v1.2.3 From bebdf803c4b43078bd09d174d6a19e7baba4e0ef Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 1 Mar 2011 18:26:57 -0800 Subject: remove [GRID] string replacement as it didn't work --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6d988e16e4..4fbef050ff 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -617,7 +617,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/[GRID]/avatars.html + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html AvatarBakedTextureUploadTimeout @@ -2566,7 +2566,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/[GRID]/guide.html + http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html DisableCameraConstraints -- cgit v1.2.3 From 0e87f37161a7b8c5df4f27b0f3a491c3b6546f66 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 2 Mar 2011 21:29:36 -0800 Subject: SOCIAL-623 FIX World map accessible from classified and picks in web profile in minimal skin --- indra/newview/app_settings/settings.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4fbef050ff..a2459890a1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12435,7 +12435,7 @@ EnableClassifieds Comment - Enable creation of new classified ads + Enable creation of new classified ads from web link Persist 1 Type @@ -12446,7 +12446,7 @@ EnableGroupInfo Comment - Enable viewing and editing of group info. + Enable viewing and editing of group info from web link Persist 1 Type @@ -12457,7 +12457,18 @@ EnablePicks Comment - Enable editing of picks + Enable editing of picks from web link + Persist + 1 + Type + Boolean + Value + 1 + + EnableWorldMap + + Comment + Enable opening world map from web link Persist 1 Type -- cgit v1.2.3 From 5e0b45ad6cac39476f78ffa8d486f06eee53797b Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 3 Mar 2011 19:52:21 -0800 Subject: SOCIAL-629 FIX Search Floater accessible from typing a search term in location bar --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a2459890a1..3dedf0ddd7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12476,5 +12476,16 @@ Value 1 + SearchFromAddressBar + + Comment + Can enter search queries into navigation address bar + Persist + 1 + Type + Boolean + Value + 1 + -- cgit v1.2.3 From f9d70c41c9b7e7c0bb1cca184e6b5e99fc75a656 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 12:42:15 -0800 Subject: SOCIAL-652 FIX Decline notification shown to users in minimal skin when they click on free one click objects --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..a8e9ca3cc9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12487,5 +12487,16 @@ Value 1 - + LogInventoryDecline + + Comment + Log in system chat whenever an inventory offer is declined + Persist + 1 + Type + Boolean + Value + 1 + + -- cgit v1.2.3 From f3e37e047206b909c212a02493be6972fba2c8aa Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Mar 2011 16:47:12 -0800 Subject: SOCIAL-588 WIP All avatar changes using avatar picker are not completed and incorrect avatar can be worn disable AIS For minimal skin --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a8e9ca3cc9..94a49f2cef 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12498,5 +12498,16 @@ Value 1 + UseHTTPInventory + + Comment + Allow use of http inventory transfers instead of UDP + Persist + 1 + Type + Boolean + Value + 1 + -- cgit v1.2.3 From 24b254c3934ad13516b1c03bf9799397fb364a81 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 9 Mar 2011 09:56:59 -0800 Subject: updated destination and avatar urls --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..3fc098f020 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -617,7 +617,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/avatars.html + AvatarBakedTextureUploadTimeout @@ -2566,7 +2566,7 @@ Type String Value - http://lecs-static-secondlife-com.s3.amazonaws.com/viewer/agni/guide.html + DisableCameraConstraints -- cgit v1.2.3 From 6158929e3ee87bc879c99d35963a151006394ed7 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Wed, 9 Mar 2011 11:51:07 -0800 Subject: SOCIAL-586 As a user I want to see my Aditi profile when logging into the Aditi grid --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..ced4c3a2eb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3899,6 +3899,17 @@ Value https://my.secondlife.com/[AGENT_NAME] + WebProfileNonProductionURL + + Comment + URL for Web Profiles on Non-Production grids + Persist + 0 + Type + String + Value + https://my-demo.secondlife.com/[AGENT_NAME] + HighResSnapshot Comment -- cgit v1.2.3 From a4d2e10c375ae3c35f5426c0bd45e650197ad189 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 10 Mar 2011 14:27:50 -0800 Subject: SOCIAL-530 WIP When double clicking a nearby location I want my avatar to walk to that spot added setting to toggle click to walk --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ea8b1c681d..88620e4193 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12531,5 +12531,16 @@ Value 1 + ClickToWalk + + Comment + Click in world to walk to location + Persist + 1 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From bc2aca863f5d27f551e48a2de8f879360a3a96ab Mon Sep 17 00:00:00 2001 From: leyla Date: Mon, 14 Mar 2011 11:23:15 -0700 Subject: SOCIAL-687 Call, Map, Share, and Pay options available in web profile for users in minimal skin --- indra/newview/app_settings/settings.xml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 3dedf0ddd7..42fd9929ae 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12476,6 +12476,39 @@ Value 1 + EnableAvatarPay + + Comment + Enable paying other avatars from web link + Persist + 1 + Type + Boolean + Value + 1 + + 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 + 1 + SearchFromAddressBar Comment -- cgit v1.2.3 From 6336022ada7811e9f36844d5f7ff660cb712fdfe Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 14 Mar 2011 17:49:11 -0700 Subject: SOCIAL-661 FIX Receiving Inventory notification in Basic Mode SOCIAL-654 FIX Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 058ececc6b..6a89f5681d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12575,5 +12575,16 @@ Value 0 + ShowOfferedInventory + + Comment + Show inventory window with last inventory offer selected when receiving inventory from other users. + Persist + 1 + Type + Boolean + Value + 1 + -- cgit v1.2.3 From 2a83929a585ddb123813370df0d53c19817ef3ba Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Sat, 19 Mar 2011 00:59:17 -0700 Subject: SOCIAL-762 FIX Viewer crash if first startup (with cleared settings.xml file) is in Advanced mode fixed not being able to change to advanced mode on clean install without logging in --- indra/newview/app_settings/settings.xml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6a89f5681d..f0e28d4ae3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3198,7 +3198,7 @@ FirstRunThisInstall Comment - Specifies that you have not run the viewer since you installed the latest update + Specifies that you have not run the viewer since you performed a clean install Persist 1 Type @@ -3206,7 +3206,18 @@ Value 1 - FirstSelectedDisabledPopups + FirstLoginThisInstall + + Comment + Specifies that you have not logged in with the viewer since you performed a clean install + Persist + 1 + Type + Boolean + Value + 1 + + FirstSelectedDisabledPopups Comment Return false if there is not disabled popup selected in the list of floater preferences popups -- cgit v1.2.3