aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateropenobject.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-30 13:04:20 -0500
committerJacek Antonelli2009-04-30 13:07:16 -0500
commitca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llfloateropenobject.cpp
parentSecond Life viewer sources 1.22.11 (diff)
downloadmeta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloateropenobject.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index a83b0c9..fc483dd 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -109,7 +110,7 @@ void LLFloaterOpenObject::show()
109 LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection(); 110 LLObjectSelectionHandle object_selection = LLSelectMgr::getInstance()->getSelection();
110 if (object_selection->getRootObjectCount() != 1) 111 if (object_selection->getRootObjectCount() != 1)
111 { 112 {
112 gViewerWindow->alertXml("UnableToViewContentsMoreThanOne"); 113 LLNotifications::instance().add("UnableToViewContentsMoreThanOne");
113 return; 114 return;
114 } 115 }
115 116
@@ -131,7 +132,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear)
131{ 132{
132 if (mObjectSelection->getRootObjectCount() != 1) 133 if (mObjectSelection->getRootObjectCount() != 1)
133 { 134 {
134 gViewerWindow->alertXml("OnlyCopyContentsOfSingleItem"); 135 LLNotifications::instance().add("OnlyCopyContentsOfSingleItem");
135 return; 136 return;
136 } 137 }
137 138
@@ -172,7 +173,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear)
172 delete data; 173 delete data;
173 data = NULL; 174 data = NULL;
174 175
175 gViewerWindow->alertXml("OpenObjectCannotCopy"); 176 LLNotifications::instance().add("OpenObjectCannotCopy");
176 } 177 }
177} 178}
178 179