diff options
| -rw-r--r-- | indra/newview/lltoolbrush.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/lltoolbrush.h | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 12 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_task_info.xml | 4 |
5 files changed, 6 insertions, 23 deletions
diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index 8c5b534d63..4ef2a26535 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -672,12 +672,6 @@ void LLToolBrushLand::alertNoTerraform(LLViewerRegion* regionp) } -// static -void LLToolBrushLand::alertNoTerraformWhileFrozen() -{ - LLNotificationsUtil::add("RegionNoTerraformingWhileFrozen"); -} - ///============================================================================ /// Local function definitions ///============================================================================ diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h index 416cdf429c..1c7f198900 100644 --- a/indra/newview/lltoolbrush.h +++ b/indra/newview/lltoolbrush.h @@ -86,9 +86,6 @@ protected: // Modal dialog that you can't terraform the region void alertNoTerraform(LLViewerRegion* regionp); - // Modal dialog that you can't terraform in frozen mode - void alertNoTerraformWhileFrozen(); - protected: F32 mStartingZ; S32 mMouseX; diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 263e10aa1f..c881bb9d81 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -878,11 +878,11 @@ </panel.string> <panel.string name="text modify info 5"> - You can't modify this object in frozen mode + You can't modify this object across a region boundary </panel.string> <panel.string name="text modify info 6"> - You can't modify these objects in frozen mode + You can't modify these objects across a region boundary </panel.string> <panel.string name="text modify warning"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0526cf9991..af00d66ff9 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1293,14 +1293,6 @@ The region [REGION] does not allow terraforming. <notification icon="alertmodal.tga" - name="RegionNoTerraformingWhileFrozen" - type="alertmodal"> - You cannot terraform land while 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="AutomaticAgentStateUnfreeze" type="alertmodal"> You have automatically switched into Unfrozen mode because of one of the following reasons: @@ -1526,9 +1518,9 @@ Please make sure none are locked, and that you own all of them. icon="alertmodal.tga" name="CannotLinkPermanent" type="alertmodal"> -Unable to link permanent objects in frozen mode. +Unable to link permanent objects. -Please switch to unfrozen mode from the menu option Build->Pathfinding->Basic Setup. +Please move all objects to the same region, and then attempt to link the objects together again. <tag>fail</tag> </notification> 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 8a823e8278..dbf44d8767 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml @@ -32,11 +32,11 @@ </panel.string> <panel.string name="text modify info 5"> - You can't modify this object in frozen mode + You can't modify this object across a region boundary </panel.string> <panel.string name="text modify info 6"> - You can't modify these objects in frozen mode + You can't modify these objects across a region boundary </panel.string> <panel.string name="text modify warning"> |