From ed48c490e0e72e745f443adbca28aa65543f6bda Mon Sep 17 00:00:00 2001 From: dolphin Date: Thu, 22 Aug 2013 09:38:32 -0700 Subject: fixed XP_ERROR rules --- indra/newview/app_settings/keywords.ini | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index a87310955f..5de79b4bf5 100755 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -52,6 +52,7 @@ remote_data remote_data(integer event_type, key channel, key message_id, str http_response http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests http_request http_request(key id, string method, string body):Triggered when task receives an http request against a public URL + # integer constants [word .1, .1, .5] TRUE Integer constant for Boolean operations @@ -668,6 +669,24 @@ TEXTURE_TRANSPARENT UUID for the "White - Transparent" texture URL_REQUEST_GRANTED Used with http_request when a public URL is successfully granted URL_REQUEST_DENIED Used with http_request when a public URL is not available +XP_ERROR_NONE No error was detected +XP_ERROR_THROTTLED The call failed due to too many recent calls. +XP_ERROR_EXPERIENCES_DISABLED The region currently has experiences disabled. +XP_ERROR_INVALID_PARAMETERS One of the string arguments was too big to fit in the key-value store. +XP_ERROR_NOT_PERMITTED This experience is not allowed to run on the current region. +XP_ERROR_NO_EXPERIENCE This script is not associated with an experience. +XP_ERROR_NOT_FOUND The sim was unable to verify the validity of the experience. Retrying after a short wait is advised. +XP_ERROR_INVALID_EXPERIENCE The script is associated with an experience that no longer exists. +XP_ERROR_EXPERIENCE_DISABLED The experience owner has temporarily disabled the experience. +XP_ERROR_EXPERIENCE_SUSPENDED The experience has been suspended by Linden Customer Support. +XP_ERROR_QUOTA_EXCEEDED An attempted write data to the key-value store failed due to the data quota being met. +XP_ERROR_STORE_DISABLED The key-value store is currently disabled on this region. +XP_ERROR_STORAGE_EXCEPTION Unable to communicate with the key-value store. +XP_ERROR_KEY_NOT_FOUND The requested key does not exist. +XP_ERROR_RETRY_UPDATE A checked update failed due to an out of date request. +XP_ERROR_UNKNOWN_ERROR Other unknown error. + + # float constants [word .3, .1, .5] PI 3.1415926535897932384626433832795 -- cgit v1.2.3 From 73b277b83b021dedc54cdaf48c3be30275a1f843 Mon Sep 17 00:00:00 2001 From: dolphin Date: Mon, 9 Dec 2013 13:47:41 -0800 Subject: Fixed windows line endings --- indra/newview/app_settings/keywords.ini | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 6209a8b616..3bcb4d666d 100755 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -714,21 +714,22 @@ TEXTURE_TRANSPARENT UUID for the "White - Transparent" texture URL_REQUEST_GRANTED Used with http_request when a public URL is successfully granted URL_REQUEST_DENIED Used with http_request when a public URL is not available -XP_ERROR_NONE No error was detected -XP_ERROR_THROTTLED The call failed due to too many recent calls. -XP_ERROR_EXPERIENCES_DISABLED The region currently has experiences disabled. -XP_ERROR_INVALID_PARAMETERS One of the string arguments was too big to fit in the key-value store. -XP_ERROR_NOT_PERMITTED This experience is not allowed to run on the current region. -XP_ERROR_NO_EXPERIENCE This script is not associated with an experience. -XP_ERROR_NOT_FOUND The sim was unable to verify the validity of the experience. Retrying after a short wait is advised. -XP_ERROR_INVALID_EXPERIENCE The script is associated with an experience that no longer exists. -XP_ERROR_EXPERIENCE_DISABLED The experience owner has temporarily disabled the experience. -XP_ERROR_EXPERIENCE_SUSPENDED The experience has been suspended by Linden Customer Support. -XP_ERROR_QUOTA_EXCEEDED An attempted write data to the key-value store failed due to the data quota being met. -XP_ERROR_STORE_DISABLED The key-value store is currently disabled on this region. -XP_ERROR_STORAGE_EXCEPTION Unable to communicate with the key-value store. -XP_ERROR_KEY_NOT_FOUND The requested key does not exist. -XP_ERROR_RETRY_UPDATE A checked update failed due to an out of date request. +XP_ERROR_NONE No error was detected +XP_ERROR_THROTTLED The call failed due to too many recent calls. +XP_ERROR_EXPERIENCES_DISABLED The region currently has experiences disabled. +XP_ERROR_INVALID_PARAMETERS One of the string arguments was too big to fit in the key-value store. +XP_ERROR_NOT_PERMITTED This experience is not allowed to run on the current region. +XP_ERROR_NO_EXPERIENCE This script is not associated with an experience. +XP_ERROR_NOT_FOUND The sim was unable to verify the validity of the experience. Retrying after a short wait is advised. +XP_ERROR_INVALID_EXPERIENCE The script is associated with an experience that no longer exists. +XP_ERROR_EXPERIENCE_DISABLED The experience owner has temporarily disabled the experience. +XP_ERROR_EXPERIENCE_SUSPENDED The experience has been suspended by Linden Customer Support. +XP_ERROR_QUOTA_EXCEEDED An attempted write data to the key-value store failed due to the data quota being met. +XP_ERROR_STORE_DISABLED The key-value store is currently disabled on this region. +XP_ERROR_STORAGE_EXCEPTION Unable to communicate with the key-value store. +XP_ERROR_KEY_NOT_FOUND The requested key does not exist. +XP_ERROR_RETRY_UPDATE A checked update failed due to an out of date request. +XP_ERROR_MATURITY_EXCEEDED The request failed due to agent content preferences. XP_ERROR_UNKNOWN_ERROR Other unknown error. -- cgit v1.2.3 From ea5a1546913eea3c2e145828ffe76fac6bdfaee9 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 15 Apr 2014 14:55:40 -0700 Subject: DD-49 : Add FUI button for Marketplace Listings --- indra/newview/app_settings/commands.xml | 10 ++++++++++ indra/newview/app_settings/toolbars.xml | 1 + 2 files changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 60c942094a..fd74166980 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -118,6 +118,16 @@ tooltip_ref="Command_Marketplace_Tooltip" execute_function="Avatar.OpenMarketplace" /> + + -- cgit v1.2.3 From acdd70688bf2c53f50cb39781179bbffcb2a400d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 12 May 2014 14:58:17 -0700 Subject: DD-89 : Add a MarketplaceListingsLogging setting to get SLM API logs. DD-22 : Fixed the delete /listing route --- 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 de11309394..c18e9a12d8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5546,6 +5546,17 @@ Value + MarketplaceListingsLogging + + Comment + Enable debug output associated with the Marketplace Listings (SLM) API. + Persist + 1 + Type + Boolean + Value + 0 + MarketplaceURL Comment -- cgit v1.2.3 From 7911e32d4bd9f86bdde5771dcaa14203befa5f7d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 5 Jun 2014 18:02:28 -0700 Subject: DD-114, DD-115, DD-116: Fixed counts on folder, folder depth and items on operations on marketplace listings --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 71715ed801..1966e71360 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4696,7 +4696,7 @@ Type U32 Value - 21 + 20 InventoryOutboxMaxFolderDepth @@ -4718,7 +4718,7 @@ Type U32 Value - 200 + 100 InventorySortOrder -- cgit v1.2.3 From f8098d2b0ff754d54b601b61edd49b67418e2060 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 2 Oct 2014 21:51:54 -0700 Subject: DD-174 : WIP : Use the correct icon for the marketplace listing FUI (toolbar) button --- indra/newview/app_settings/commands.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 87ac7cce2c..9b12254ce3 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -120,7 +120,7 @@ /> Date: Sun, 5 Oct 2014 20:17:29 -0700 Subject: DD-170 : Handle 503 answer from SLM and added a MARKET_MERCHANT_NOT_MIGRATED state to the UI, showing only the relevant UI to the user (i.e. Merchant Outbox or Marketplace Listings). --- indra/newview/app_settings/commands.xml | 6 ++++-- indra/newview/app_settings/settings.xml | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 9b12254ce3..2cd6638042 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -123,8 +123,10 @@ icon="Command_MktListings_Icon" label_ref="Command_MarketplaceListings_Label" tooltip_ref="Command_MarketplaceListings_Tooltip" - execute_function="Floater.ToggleOrBringToFront" - execute_parameters="marketplace_listings" + execute_function="Marketplace.Toggle" + execute_parameters="marketplace" + is_enabled_function="Marketplace.Enabled" + is_enabled_parameters="marketplace" is_running_function="Floater.IsOpen" is_running_parameters="marketplace_listings" /> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index abe477f38d..a666c72686 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4621,17 +4621,6 @@ Value 0 - InventoryDisplayOutbox - - Comment - Override merchant inventory outbox display - Persist - 0 - Type - Boolean - Value - 0 - InventoryInboxToggleState Comment @@ -4654,6 +4643,17 @@ Value 0 + InventoryOutboxDisplayBoth + + Comment + Show the legacy Merchant Outbox UI as well as the Marketplace Listings UI + Persist + 1 + Type + Boolean + Value + 0 + InventoryOutboxLogging Comment -- cgit v1.2.3 From 2939a542f97c5643457f0087915c733b949a0eb9 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 7 Nov 2014 16:47:19 -0800 Subject: DD-272 : Be more consistent when updating the count on hand in SLM, also prevent multiple folder update when receiving data from SLM --- 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 2d835fb2f7..dca2062211 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4718,7 +4718,7 @@ Type U32 Value - 100 + 200 InventorySortOrder -- cgit v1.2.3 From c7f24a69cfa0e87160d98325431c3098dcd8295b Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 17 Mar 2015 12:59:37 -0700 Subject: DD-362 : WIP : Check stock folder count limit --- 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 4a106c08e4..731f64e70e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4742,6 +4742,17 @@ Value 200 + InventoryOutboxMaxStockItemCount + + Comment + Maximum number of items allowed in a stock folder. + Persist + 0 + Type + U32 + Value + 200 + InventorySortOrder Comment -- cgit v1.2.3 From 7816dfd5ac8ebb92f66c738d7f0ed61bbf7c0282 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 15 May 2015 20:10:45 -0700 Subject: DD-403: Make the sort order persistent in marketplace listings floater --- 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 1b53a06a85..778020a92e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4790,6 +4790,17 @@ Value 7 + MarketplaceListingsSortOrder + + Comment + Specifies sort for marketplace listings + Persist + 1 + Type + U32 + Value + 2 + InvertMouse Comment -- cgit v1.2.3 From 30d35f5cfbeec2d5d0dc0f85ff31d0bab4a56e87 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 8 Jun 2015 18:13:07 -0400 Subject: make a lot of values agree with declared types --- indra/newview/app_settings/settings.xml | 96 ++++++++++++++++----------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 845cb5ae96..9d9bc43bd7 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -47,7 +47,7 @@ Type S32 Value - 300 + 300.0 AckCollectTime @@ -80,7 +80,7 @@ Type F32 Value - 1 + 1.0 AdvanceSnapshot @@ -1651,7 +1651,7 @@ Type S32 Value - 100 + 100 ChatLoadGroupTimeout @@ -4260,7 +4260,7 @@ Type F32 Value - 3 + 3.0 FullScreenAutoDetectAspectRatio @@ -6275,7 +6275,7 @@ Type Boolean Value - 0 + 0 MeshEnabled @@ -6286,7 +6286,7 @@ Type Boolean Value - 1 + 1 MeshImportUseSLM @@ -6297,7 +6297,7 @@ Type Boolean Value - 1 + 1 MeshUploadLogXML @@ -6308,7 +6308,7 @@ Type Boolean Value - 0 + 0 MeshUploadFakeErrors @@ -6319,7 +6319,7 @@ Type S32 Value - 0 + 0 MeshUploadTimeOut @@ -6330,7 +6330,7 @@ Type S32 Value - 600 + 600 MigrateCacheDirectory @@ -8554,7 +8554,7 @@ Type F32 Value - 64 + 64.0 RenderCubeMap @@ -8690,7 +8690,7 @@ Type U32 Value - 16 + 16 RenderEdgeDepthCutoff @@ -8736,7 +8736,7 @@ Type F32 Value - 4 + 4.0 RenderDeferredSpotShadowBias @@ -8803,7 +8803,7 @@ Type F32 Value - 0 + 0.0 RenderDepthPrePass @@ -8997,7 +8997,7 @@ Type U32 Value - 0 + 0 RenderSpecularResX @@ -9009,7 +9009,7 @@ Type U32 Value - 1024 + 1024 RenderSpecularResY @@ -9021,7 +9021,7 @@ Type U32 Value - 256 + 256 RenderSpecularExponent @@ -9177,7 +9177,7 @@ Type U32 Value - 4 + 4 RenderShadowBlurDistFactor @@ -9344,9 +9344,9 @@ Vector3 Value - 1 - 0 - 0 + 1.0 + 0.0 + 0.0 RenderGlowMaxExtractAlpha @@ -9947,7 +9947,7 @@ Type U32 Value - 0 + 0 RenderAutoMuteLogging @@ -10169,7 +10169,7 @@ Type U32 Value - 250000 + 250000 MeshMetaDataDiscount @@ -10180,7 +10180,7 @@ Type U32 Value - 384 + 384 MeshMinimumByteSize @@ -10191,7 +10191,7 @@ Type U32 Value - 16 + 16 MeshBytesPerTriangle @@ -10202,7 +10202,7 @@ Type U32 Value - 16 + 16 Mesh2MaxConcurrentRequests @@ -10334,7 +10334,7 @@ Type U32 Value - 1024 + 1024 SceneLoadLowMemoryBound @@ -10345,7 +10345,7 @@ Type U32 Value - 750 + 750 SceneLoadMinRadius @@ -12138,7 +12138,7 @@ Type S32 Value - 6 + 6 UICheckboxctrlBtnSize @@ -12149,7 +12149,7 @@ Type S32 Value - 13 + 13 UICheckboxctrlHeight @@ -12160,7 +12160,7 @@ Type S32 Value - 16 + 16 UICheckboxctrlHPad @@ -12171,7 +12171,7 @@ Type S32 Value - 2 + 2 UICheckboxctrlSpacing @@ -12182,7 +12182,7 @@ Type S32 Value - 5 + 5 UICheckboxctrlVPad @@ -12193,7 +12193,7 @@ Type S32 Value - 2 + 2 UICloseBoxFromTop @@ -12204,7 +12204,7 @@ Type S32 Value - 5 + 5 UIExtraTriangleHeight @@ -12215,7 +12215,7 @@ Type S32 Value - -1 + -1 UIExtraTriangleWidth @@ -12226,7 +12226,7 @@ Type S32 Value - 4 + 4 UIFloaterCloseBoxSize @@ -12237,7 +12237,7 @@ Type S32 Value - 16 + 16 UIFloaterHPad @@ -12248,7 +12248,7 @@ Type S32 Value - 6 + 6 UIFloaterTestBool @@ -12468,7 +12468,7 @@ Type S32 Value - 500 + 500 UIMinimizedWidth @@ -12479,7 +12479,7 @@ Type S32 Value - 160 + 160 UIMultiSliderctrlSpacing @@ -12490,7 +12490,7 @@ Type S32 Value - 4 + 4 UIMultiTrackHeight @@ -13150,7 +13150,7 @@ Type S32 Value - 3 + 3 UseCircuitCodeTimeout @@ -15158,9 +15158,9 @@ Color4 Value - 0 - 0 - 0 + 0.0 + 0.0 + 0.0 1.0 @@ -15477,7 +15477,7 @@ Type F32 Value - 2 + 2.0 TeleportLocalDelay @@ -15488,7 +15488,7 @@ Type F32 Value - 1 + 1.0 FMODExProfilerEnable -- cgit v1.2.3