diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-27 17:08:33 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-27 17:08:33 -0700 |
| commit | 932921766740655de84108970095ca17d24c5829 (patch) | |
| tree | 054fefb01ed02d3174daf32f1d39b023c1c5376c /indra/newview/skins | |
| parent | 1bba68c920315fc2a09cda6e2de35d0ea42a9c8b (diff) | |
PATH-585: Adding an initial notification for when a server-side automatic unfreeze occurs.
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 34 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 |
2 files changed, 37 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 3b03bc0aed..a0a670f233 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -77,6 +77,21 @@ </form> </template> + <template name="okhelpignore"> + <form> + <button + default="true" + index="0" + name="OK_okhelpignore" + text="$yestext"/> + <button + index="1" + name="Help_okhelpignore" + text="$helptext"/> + <ignore text="$ignoretext"/> + </form> + </template> + <template name="yesnocancelbuttons"> <form> <button @@ -1286,6 +1301,25 @@ The region [REGION] does not allow terraforming. <notification icon="alertmodal.tga" + name="AutomaticAgentStateUnfreeze" + type="alertmodal"> +You have automatically switched into Unfrozen mode because of one of the following reasons: + +- You rezzed an object marked as permanent +- You returned an object marked as permanent + +After you finish modifying your permanent objects, please remember to switch back to Frozen mode from the menu option Build->Pathfinding->Basic Setup. + <tag>confirm</tag> + <usetemplate + name="okhelpignore" + yestext="OK" + helptext="More Info" + ignoretext="Launch browser to view pathfinding help" + /> + </notification> + + <notification + icon="alertmodal.tga" name="CannotCopyWarning" type="alertmodal"> You do not have permission to copy the following items: diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 61935c77c3..5fb629b704 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3888,6 +3888,9 @@ Try enclosing path to the editor with double quotes. <string name="Preview">Preview</string> <string name="Normal">Normal</string> + <!-- Pathfinding --> + <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string> + <!-- Snapshot image quality levels --> <string name="snapshot_quality_very_low">Very Low</string> <string name="snapshot_quality_low">Low</string> |