diff options
| author | UbitUmarov | 2012-10-30 19:42:32 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-10-30 19:42:32 +0000 |
| commit | e6c8eca504a4cc0daace04ad51c2cb65b3904591 (patch) | |
| tree | 7966cbf850ac084e3c1d1ab7b3e788a75844bbe7 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
| parent | revert last change (diff) | |
| parent | Set the script state to new rez when a scriptis saved, rather than region start. (diff) | |
| download | opensim-SC_OLD-e6c8eca504a4cc0daace04ad51c2cb65b3904591.zip opensim-SC_OLD-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.gz opensim-SC_OLD-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.bz2 opensim-SC_OLD-e6c8eca504a4cc0daace04ad51c2cb65b3904591.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
| -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 c705f10..650cd50 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -1116,17 +1116,17 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 1116 | else | 1116 | else |
| 1117 | { | 1117 | { |
| 1118 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost); | 1118 | AddNewInventoryItem(m_HostCapsObj.AgentID, item, (uint)cost); |
| 1119 | if (client != null) | 1119 | // if (client != null) |
| 1120 | { | 1120 | // { |
| 1121 | // let users see anything.. i don't so far | 1121 | // // let users see anything.. i don't so far |
| 1122 | string str; | 1122 | // string str; |
| 1123 | if (cost > 0) | 1123 | // if (cost > 0) |
| 1124 | // dont remember where is money unit name to put here | 1124 | // // dont remember where is money unit name to put here |
| 1125 | str = "Upload complete. charged " + cost.ToString() + "$"; | 1125 | // str = "Upload complete. charged " + cost.ToString() + "$"; |
| 1126 | else | 1126 | // else |
| 1127 | str = "Upload complete"; | 1127 | // str = "Upload complete"; |
| 1128 | client.SendAgentAlertMessage(str, true); | 1128 | // client.SendAgentAlertMessage(str, true); |
| 1129 | } | 1129 | // } |
| 1130 | } | 1130 | } |
| 1131 | } | 1131 | } |
| 1132 | 1132 | ||