aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2010-05-01 10:04:13 -0500
committerJacek Antonelli2010-05-01 10:04:20 -0500
commitf03c737455e8178f8c6b31b04d5c0387ad5f18a8 (patch)
tree0234b27a106beb1500406640b1025b9f7f8ace09
parentMerged 1.2.2 (TPV) into 1.3. (diff)
downloadmeta-impy-f03c737455e8178f8c6b31b04d5c0387ad5f18a8.zip
meta-impy-f03c737455e8178f8c6b31b04d5c0387ad5f18a8.tar.gz
meta-impy-f03c737455e8178f8c6b31b04d5c0387ad5f18a8.tar.bz2
meta-impy-f03c737455e8178f8c6b31b04d5c0387ad5f18a8.tar.xz
Ported 'NoTextureExportSL' message from 1.2.2 to new notification system.
-rw-r--r--linden/indra/newview/primbackup.cpp4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml7
2 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 5b704f1..63043f0 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -377,6 +377,10 @@ void primbackup::exportworker(void *userdata)
377 377
378 if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false)) 378 if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
379 { 379 {
380 if(gHippoGridManager->getConnectedGrid()->isSecondLife())
381 {
382 LLNotifications::instance().add("NoTextureExportSL");
383 }
380 primbackup::getInstance()->export_state=EXPORT_STRUCTURE; 384 primbackup::getInstance()->export_state=EXPORT_STRUCTURE;
381 } 385 }
382 else 386 else
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 2754b3a..f70d837 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6691,6 +6691,13 @@ Go to the Official Imprudence Forums to discuss the Imprudence Project.
6691 Shadows cannot be enabled due to your graphics settings being set too low. Make sure your graphics settings are set to Ultra with Basic and Atmospheric Shaders enabled. 6691 Shadows cannot be enabled due to your graphics settings being set too low. Make sure your graphics settings are set to Ultra with Basic and Atmospheric Shaders enabled.
6692 </notification> 6692 </notification>
6693 6693
6694 <notification
6695 icon="notifytip.tga"
6696 name="NoTextureExportSL"
6697 type="notifytip">
6698 Note: To comply with the Second Life Terms of Service, Imprudence did not download any texture files for the exported object(s).
6699 </notify>
6700
6694 6701
6695 <!--End Imprudence notifications--> 6702 <!--End Imprudence notifications-->
6696 6703