diff options
| author | Melanie | 2011-05-23 03:39:20 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-23 03:39:20 +0100 |
| commit | b9fb7cdf9f266505cb05c1e50be897ba00d54435 (patch) | |
| tree | 483719d3bf33cd35c021182ac7152308d37b5d1b /OpenSim/Region/ScriptEngine/Shared | |
| parent | Implement llGodLikeRezObject and llGetUsedMemory (diff) | |
| parent | Fix Mantis #4429: Allow llGiveInventory to work across sim borders. (diff) | |
| download | opensim-SC_OLD-b9fb7cdf9f266505cb05c1e50be897ba00d54435.zip opensim-SC_OLD-b9fb7cdf9f266505cb05c1e50be897ba00d54435.tar.gz opensim-SC_OLD-b9fb7cdf9f266505cb05c1e50be897ba00d54435.tar.bz2 opensim-SC_OLD-b9fb7cdf9f266505cb05c1e50be897ba00d54435.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c87f8ba..f7c44d1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4300,7 +4300,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4300 | m_host.AbsolutePosition.ToString(), | 4300 | m_host.AbsolutePosition.ToString(), |
| 4301 | agentItem.ID, true, m_host.AbsolutePosition, | 4301 | agentItem.ID, true, m_host.AbsolutePosition, |
| 4302 | bucket); | 4302 | bucket); |
| 4303 | |||
| 4304 | if (m_TransferModule != null) | 4303 | if (m_TransferModule != null) |
| 4305 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); | 4304 | m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); |
| 4306 | 4305 | ||