aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-09-24 23:19:57 +0200
committerMelanie2012-09-24 23:19:57 +0200
commit421071bd8a489b90d3ddd58add7135b178f59381 (patch)
treed6215b4d2a8039114e501c8098244dac68099758 /OpenSim
parent more upload changes (plus untouch prebuild.xml) (diff)
downloadopensim-SC_OLD-421071bd8a489b90d3ddd58add7135b178f59381.zip
opensim-SC_OLD-421071bd8a489b90d3ddd58add7135b178f59381.tar.gz
opensim-SC_OLD-421071bd8a489b90d3ddd58add7135b178f59381.tar.bz2
opensim-SC_OLD-421071bd8a489b90d3ddd58add7135b178f59381.tar.xz
Text changes for upload messages
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 4a323d8..c705f10 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -596,7 +596,7 @@ namespace OpenSim.Region.ClientStack.Linden
596 596
597 597
598 if(IsAtestUpload) // let user know, still showing cost estimation 598 if(IsAtestUpload) // let user know, still showing cost estimation
599 warning += "Upload will have no cost, for personal test purposes only. Other uses are forbiden. Items may not work on another region"; 599 warning += "Upload will have no cost, for testing purposes only. Other uses are prohibited. Items will not work after 48 hours or on other regions";
600 600
601 // check funds 601 // check funds
602 else 602 else
@@ -982,7 +982,7 @@ namespace OpenSim.Region.ClientStack.Linden
982 } 982 }
983 983
984 if(istest) 984 if(istest)
985 prim.Description = "For personal testing only. Other uses are forbiden"; 985 prim.Description = "For testing only. Other uses are prohibited";
986 else 986 else
987 prim.Description = ""; 987 prim.Description = "";
988 988
@@ -1066,7 +1066,7 @@ namespace OpenSim.Region.ClientStack.Linden
1066 item.AssetID = asset.FullID; 1066 item.AssetID = asset.FullID;
1067 if (istest) 1067 if (istest)
1068 { 1068 {
1069 item.Description = "For personal testing only. Other uses are forbiden"; 1069 item.Description = "For testing only. Other uses are prohibited";
1070 item.Flags = (uint) (InventoryItemFlags.SharedSingleReference); 1070 item.Flags = (uint) (InventoryItemFlags.SharedSingleReference);
1071 } 1071 }
1072 else 1072 else
@@ -1541,7 +1541,7 @@ namespace OpenSim.Region.ClientStack.Linden
1541 if (m_IsAtestUpload) 1541 if (m_IsAtestUpload)
1542 { 1542 {
1543 LLSDAssetUploadError resperror = new LLSDAssetUploadError(); 1543 LLSDAssetUploadError resperror = new LLSDAssetUploadError();
1544 resperror.message = "Upload SUCESSEFULL for testing purposes only. Other uses are forbiden. Item may not work on other region"; 1544 resperror.message = "Upload SUCESSEFULL for testing purposes only. Other uses are prohibited. Item will not work after 48 hours or on other regions";
1545 resperror.identifier = inv; 1545 resperror.identifier = inv;
1546 1546
1547 uploadComplete.error = resperror; 1547 uploadComplete.error = resperror;