diff options
author | dolphin <dolphin@lindenlab.com> | 2013-09-24 19:10:43 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-09-24 19:10:43 -0700 |
commit | 09964ec6ede2c9dba5954448bff6b2da2dc179af (patch) | |
tree | d77702dba541a88c5b29e148d5cb1565fa1abbb8 /indra/newview/skins/default | |
parent | 48e1e10fd69aaea6ef22feb2518e80a120e9f999 (diff) |
Created an experience specific permissions dialog.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_experienceprofile.xml | 4 | ||||
-rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 34 | ||||
-rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 4 |
3 files changed, 38 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml index a3408c5e58..ca9469474c 100644 --- a/indra/newview/skins/default/xui/en/floater_experienceprofile.xml +++ b/indra/newview/skins/default/xui/en/floater_experienceprofile.xml @@ -103,9 +103,7 @@ left="10" right="-123" visible="false" - name="grid_wide"> - Grid-wide - </text> + name="grid_wide"/> <button follows="top|right" height="23" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ebd2799ebf..ef4044bedd 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6930,6 +6930,40 @@ Is this OK? text="Block"/> </form> </notification> + <notification + icon="notify.tga" + name="ScriptQuestionExperience" + persist="true" + type="notify"> +'<nolink>[OBJECTNAME]</nolink>', an object owned by '[NAME]', requests your participation in the [GRID_WIDE]experience: + +[EXPERIENCE] + +Once permission is granted you will not see this message again for this experience unless it is revoked from the experience profile. + +Scripts associated with this experience will be able to do the following on regions where the experience is active: + +[QUESTIONS]Is this OK? + <tag>confirm</tag> + <form name="form"> + <button + index="0" + name="Yes" + text="Yes"/> + <button + index="1" + name="No" + text="No"/> + <button + index="2" + name="Mute" + text="Block Object"/> + <button + index="3" + name="BlockExperience" + text="Block Experience"/> + </form> + </notification> <notification icon="notify.tga" 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.</string> <string name="NotConnected">Not Connected</string> <string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name --> <string name="TeleportYourAgent">Teleport you</string> - <string name="JoinAnExperience">Join an experience</string> <!-- not used --> + <string name="JoinAnExperience"></string> <!-- intentionally left blank --> + <string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string> <string name="OverrideYourAnimations">Replace your default animations</string> <string name="ScriptReturnObjects">Return objects on your behalf</string> @@ -3923,6 +3924,7 @@ Try enclosing path to the editor with double quotes. <!-- Experience Tools strings --> <string name="experience_tools_experience">Experience</string> <string name="ExperienceNameNull">(no experience)</string> + <string name="GRID_WIDE">Grid-wide</string> <!-- Conversation log messages --> <string name="logging_calls_disabled_log_empty"> |