From 2d9ad6ba687cacc81251e1ce57e323b0c2782db9 Mon Sep 17 00:00:00 2001 From: dolphin Date: Wed, 13 Mar 2013 08:53:51 -0700 Subject: Added group roles for experiences and updated the roles management UI to access them. --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 4383b98592..2e1e740d6f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3907,4 +3907,7 @@ Try enclosing path to the editor with double quotes. [User] + + Experience + -- cgit v1.2.3 From 48e1e10fd69aaea6ef22feb2518e80a120e9f999 Mon Sep 17 00:00:00 2001 From: dolphin Date: Mon, 23 Sep 2013 11:44:21 -0700 Subject: Added LLUrlEntryExperienceProfile to link to experience profiles Added LLExperienceHandler to handle experience links Updated LLSidepanelItemInfo to use profile links --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index b02d4e5d8f..0c84d904a8 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3922,7 +3922,7 @@ Try enclosing path to the editor with double quotes. Experience - + (no experience) -- cgit v1.2.3 From 09964ec6ede2c9dba5954448bff6b2da2dc179af Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 24 Sep 2013 19:10:43 -0700 Subject: Created an experience specific permissions dialog. --- indra/newview/skins/default/xui/en/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0c84d904a8..fc189b5d62 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -414,7 +414,8 @@ Please try logging in again in a minute. Not Connected (You) Teleport you - Join an experience + + Suppress alerts when managing estate access lists Replace your default animations Return objects on your behalf @@ -3923,6 +3924,7 @@ Try enclosing path to the editor with double quotes. Experience (no experience) + Grid-wide -- cgit v1.2.3 From e510fa3ee064ce03a48852fdea26be781e8fa8b6 Mon Sep 17 00:00:00 2001 From: dolphin Date: Thu, 3 Oct 2013 12:59:44 -0700 Subject: First pass at functional experience list floater --- indra/newview/skins/default/xui/en/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index fc189b5d62..70c990872e 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3925,6 +3925,11 @@ Try enclosing path to the editor with double quotes. Experience (no experience) Grid-wide + Allowed + Blocked + Contributor + Admin + Recent -- cgit v1.2.3 From 8add9a00f81b84f5268fc264f5871b04ae8547b8 Mon Sep 17 00:00:00 2001 From: dolphin Date: Mon, 14 Oct 2013 11:25:21 -0700 Subject: Updated strings for the experience list floater --- indra/newview/skins/default/xui/en/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 530ed160bd..eda35474ac 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3927,11 +3927,11 @@ Try enclosing path to the editor with double quotes. Experience (no experience) Grid-wide - Allowed - Blocked - Contributor - Admin - Recent + ALLOWED + BLOCKED + CONTRIBUTOR + ADMIN + RECENT -- cgit v1.2.3 From c1f730ed46c14c12d5856109b622bf085c39abb0 Mon Sep 17 00:00:00 2001 From: dolphin Date: Wed, 26 Feb 2014 17:32:21 -0800 Subject: Moved the experience acquire code to the experiences panel --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index fed2d764d0..bf925e02f0 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3949,6 +3949,7 @@ Try enclosing path to the editor with double quotes. CONTRIBUTOR ADMIN RECENT + OWNED -- cgit v1.2.3 From b2591ca63c498ab606bf595e0b2e729e76caea24 Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 18 Mar 2014 14:12:22 -0700 Subject: Added a default message handler for experience logs. Currently just forwards the notification. --- indra/newview/skins/default/xui/en/strings.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 5badeff38b..dc9e96e2f2 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3985,7 +3985,15 @@ Try enclosing path to the editor with double quotes. ADMIN RECENT OWNED - + take over your controls + override animations on your avatar + attach to your avatar + track your camera + control your camera + teleport you + automatically accept experience permissions + perform an unknown operation: [Permission] + Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat. -- cgit v1.2.3 From dba034ee100dae4b62ddf12523835a413a25f189 Mon Sep 17 00:00:00 2001 From: dolphin Date: Thu, 20 Mar 2014 16:32:31 -0700 Subject: Experience log panel --- indra/newview/skins/default/xui/en/strings.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index dc9e96e2f2..37aaf941af 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3992,7 +3992,15 @@ Try enclosing path to the editor with double quotes. control your camera teleport you automatically accept experience permissions - perform an unknown operation: [Permission] + perform an unknown operation: [Permission] + Take Controls + Override Animations + Attach + Track Camera + Control Camera + Teleport + Permission + Unknown: [Permission] -- cgit v1.2.3 From 37411bc7ebc5a34e8c9a5c43471291224a3cd35a Mon Sep 17 00:00:00 2001 From: dolphin Date: Fri, 21 Mar 2014 16:58:43 -0700 Subject: Experience log panel is live and updates as new events come in. Multiple identical events get collapsed int a single entry. --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 37aaf941af..a17a895b42 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3986,7 +3986,7 @@ Try enclosing path to the editor with double quotes. RECENT OWNED take over your controls - override animations on your avatar + trigger animations on your avatar attach to your avatar track your camera control your camera @@ -3994,7 +3994,7 @@ Try enclosing path to the editor with double quotes. automatically accept experience permissions perform an unknown operation: [Permission] Take Controls - Override Animations + Trigger Animations Attach Track Camera Control Camera -- cgit v1.2.3 From f45218ff32a20d1bd490fb9dc3951c4986bdd5ca Mon Sep 17 00:00:00 2001 From: Cho Date: Thu, 1 May 2014 22:57:04 +0100 Subject: Added counter of experiences in trusted/allowed/blocked lists in Region/Estate floater for ACME-1435 --- indra/newview/skins/default/xui/en/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7985997524..ea27d142b7 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3995,6 +3995,9 @@ Try enclosing path to the editor with double quotes. ADMIN RECENT OWNED + Allowed Experiences: ([EXPERIENCES], max [MAXEXPERIENCES]) + Blocked Experiences: ([EXPERIENCES], max [MAXEXPERIENCES]) + Trusted Experiences: ([EXPERIENCES], max [MAXEXPERIENCES]) take over your controls trigger animations on your avatar attach to your avatar -- cgit v1.2.3 From d331db79c2a1f07f9919703677b44d4664c36509 Mon Sep 17 00:00:00 2001 From: dolphin Date: Wed, 7 May 2014 16:48:45 -0700 Subject: Build>Scripts>Recompile Scripts now will skip Experience scripts that the agent can not contribute to and will keep Experience association otherwise. --- indra/newview/skins/default/xui/en/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a45aaa2e99..ef6877b5fa 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2464,7 +2464,8 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. Problem downloading Insufficient permissions to download a script. Insufficient permissions for - Unknown failure to download + Unknown failure to download + Skipping script [SCRIPT] with Experience [EXPERIENCE]. Recompilation Progress recompile Reset Progress -- cgit v1.2.3 From 4c7b0cb528f61bc20866c2f7c43049ef7bc49bf2 Mon Sep 17 00:00:00 2001 From: dolphin Date: Fri, 16 May 2014 15:52:39 -0700 Subject: ACME-1459: Experience tab added to the about land tab for editing parcel Experiences --- indra/newview/skins/default/xui/en/strings.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index ef6877b5fa..72b41f922e 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3997,9 +3997,7 @@ Try enclosing path to the editor with double quotes. ADMIN RECENT OWNED - Allowed Experiences: ([EXPERIENCES], max [MAXEXPERIENCES]) - Blocked Experiences: ([EXPERIENCES], max [MAXEXPERIENCES]) - Trusted Experiences: ([EXPERIENCES], max [MAXEXPERIENCES]) + ([EXPERIENCES], max [MAXEXPERIENCES]) take over your controls trigger animations on your avatar attach to your avatar -- cgit v1.2.3 From 89eac2548a9b66d8bab27a7e8d7d1ed2159e9515 Mon Sep 17 00:00:00 2001 From: Cho Date: Wed, 20 Aug 2014 01:11:27 +0100 Subject: Made it possible to search for experiences with an empty search string, and show experiences with blank names as (untitled experience) for ACME-1585 --- indra/newview/skins/default/xui/en/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 72cebb1060..1bf1ee930c 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4028,6 +4028,7 @@ Try enclosing path to the editor with double quotes. Experience (no experience) + (untitled experience) Grid-wide ALLOWED BLOCKED -- cgit v1.2.3 From 8cc8e7dc77c7aff6d4698632d6a3bebe76698ff7 Mon Sep 17 00:00:00 2001 From: dolphin Date: Tue, 28 Oct 2014 11:43:45 -0700 Subject: ACME-1601: Updated message to match behavior ACME-1616: Change references of "Grid-Wide" to "Grid-Scope" and "non Grid-Wide" to "Land-Scope" --- indra/newview/skins/default/xui/en/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/strings.xml') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index fbf696933b..65c95e9486 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4031,7 +4031,8 @@ Try enclosing path to the editor with double quotes. Experience (no experience) (untitled experience) - Grid-wide + Land-Scope + Grid-Scope ALLOWED BLOCKED CONTRIBUTOR -- cgit v1.2.3