diff options
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index f509d94..f6146a9 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -1117,17 +1117,17 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1117 | else | 1117 | else |
1118 | { | 1118 | { |
1119 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost); | 1119 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost); |
1120 | if (client != null) | 1120 | // if (client != null) |
1121 | { | 1121 | // { |
1122 | // let users see anything.. i don't so far | 1122 | // // let users see anything.. i don't so far |
1123 | string str; | 1123 | // string str; |
1124 | if (cost > 0) | 1124 | // if (cost > 0) |
1125 | // dont remember where is money unit name to put here | 1125 | // // dont remember where is money unit name to put here |
1126 | str = "Upload complete. charged " + cost.ToString() + "$"; | 1126 | // str = "Upload complete. charged " + cost.ToString() + "$"; |
1127 | else | 1127 | // else |
1128 | str = "Upload complete"; | 1128 | // str = "Upload complete"; |
1129 | client.SendAgentAlertMessage(str, true); | 1129 | // client.SendAgentAlertMessage(str, true); |
1130 | } | 1130 | // } |
1131 | } | 1131 | } |
1132 | } | 1132 | } |
1133 | 1133 | ||