aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2010-04-27 22:24:20 -0500
committerJacek Antonelli2010-04-28 02:02:04 -0500
commit5cb0acf94eae6f6501943914fbf05e3308608aff (patch)
tree6435231867edae6f59c53a8b314fb5b48264cff6
parentDisabled exporting object textures when connected to SL. (diff)
downloadmeta-impy-5cb0acf94eae6f6501943914fbf05e3308608aff.zip
meta-impy-5cb0acf94eae6f6501943914fbf05e3308608aff.tar.gz
meta-impy-5cb0acf94eae6f6501943914fbf05e3308608aff.tar.bz2
meta-impy-5cb0acf94eae6f6501943914fbf05e3308608aff.tar.xz
Added a notification to say that textures were not exported on SL.
-rw-r--r--linden/indra/newview/primbackup.cpp4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notify.xml7
2 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
index 240f498..9a8a34f 100644
--- a/linden/indra/newview/primbackup.cpp
+++ b/linden/indra/newview/primbackup.cpp
@@ -384,6 +384,10 @@ void primbackup::exportworker(void *userdata)
384 384
385 if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false)) 385 if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
386 { 386 {
387 if(gHippoGridManager->getConnectedGrid()->isSecondLife())
388 {
389 LLNotifyBox::showXml("NoTextureExportSL");
390 }
387 primbackup::getInstance()->export_state=EXPORT_STRUCTURE; 391 primbackup::getInstance()->export_state=EXPORT_STRUCTURE;
388 } 392 }
389 else 393 else
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 09b00de..cfc6515 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -1096,4 +1096,11 @@ Click Accept to join the chat or Decline to decline the invitation. Click Mute t
1096 The URL you clicked cannot be opened from this web browser. 1096 The URL you clicked cannot be opened from this web browser.
1097 </message> 1097 </message>
1098 </notify> 1098 </notify>
1099
1100 <notify name="NoTextureExportSL" tip="true">
1101 <message name="message">
1102 Note: To comply with the Second Life Terms of Service, Imprudence did not download any texture files for the exported object(s).
1103 </message>
1104 </notify>
1105
1099</notifications> 1106</notifications>