aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerinventory.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/llviewerinventory.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 'linden/indra/newview/llviewerinventory.cpp')
-rw-r--r--linden/indra/newview/llviewerinventory.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index bff310e..7f1f0fe 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.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,
@@ -403,7 +404,7 @@ void LLViewerInventoryCategory::updateServer(BOOL is_new) const
403 // communicate that change with the server. 404 // communicate that change with the server.
404 if(LLAssetType::AT_NONE != mPreferredType) 405 if(LLAssetType::AT_NONE != mPreferredType)
405 { 406 {
406 LLNotifyBox::showXml("CannotModifyProtectedCategories"); 407 LLNotifications::instance().add("CannotModifyProtectedCategories");
407 return; 408 return;
408 } 409 }
409 410
@@ -427,7 +428,7 @@ void LLViewerInventoryCategory::removeFromServer( void )
427 // communicate that change with the server. 428 // communicate that change with the server.
428 if(LLAssetType::AT_NONE != mPreferredType) 429 if(LLAssetType::AT_NONE != mPreferredType)
429 { 430 {
430 LLNotifyBox::showXml("CannotRemoveProtectedCategories"); 431 LLNotifications::instance().add("CannotRemoveProtectedCategories");
431 return; 432 return;
432 } 433 }
433 434