diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-04-02 18:12:58 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-04-02 18:12:58 -0500 |
| commit | 0cce43aefefa2546b83f373ed81f8dbc7a6241d2 (patch) | |
| tree | 7c228bd77d7787b5865de61f9dbd754b9dcd83a7 /indra/newview/skins | |
| parent | 6e184e33018a5395bfbb2c92812229d115944ab5 (diff) | |
| parent | 9ccc2a0fced1a5b1e6bdef34eef07133f7754c72 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 8 |
3 files changed, 26 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 528d2a7064..0a90cea886 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -877,6 +877,14 @@ You can't modify these objects </panel.string> <panel.string + name="text modify info 5"> + You can't modify this object in frozen mode + </panel.string> + <panel.string + name="text modify info 6"> + You can't modify these objects in frozen mode + </panel.string> + <panel.string name="text modify warning"> You must select entire object to set permissions </panel.string> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f6c29cc191..e1a7c6309d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1490,6 +1490,16 @@ Please make sure none are locked, and that you own all of them. <notification icon="alertmodal.tga" + name="CannotLinkPermanent" + type="alertmodal"> +Unable to link permanent objects in frozen mode. + +Please switch to unfrozen mode from the menu option Build->Pathfinding->Basic Setup. + <tag>fail</tag> + </notification> + + <notification + icon="alertmodal.tga" name="CannotLinkDifferentOwners" type="alertmodal"> Unable to link because not all of the objects have the same owner. diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml index 6600339ad7..8a823e8278 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -31,6 +31,14 @@ You can't modify these objects </panel.string> <panel.string + name="text modify info 5"> + You can't modify this object in frozen mode + </panel.string> + <panel.string + name="text modify info 6"> + You can't modify these objects in frozen mode + </panel.string> + <panel.string name="text modify warning"> This object has linked parts </panel.string> |