diff options
| author | Melanie | 2011-04-12 00:27:39 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-12 00:27:39 +0100 |
| commit | 42b96a8be0e6cc754776058071fb60782ec05023 (patch) | |
| tree | f5e3f8e4b4e5c27ee5f83c5c3e9f2aae5bcf7e11 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | minor: add a bit more method doc to IInventoryService.GetItem() (diff) | |
| download | opensim-SC_OLD-42b96a8be0e6cc754776058071fb60782ec05023.zip opensim-SC_OLD-42b96a8be0e6cc754776058071fb60782ec05023.tar.gz opensim-SC_OLD-42b96a8be0e6cc754776058071fb60782ec05023.tar.bz2 opensim-SC_OLD-42b96a8be0e6cc754776058071fb60782ec05023.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 | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8ceb814..cda8adb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -10930,12 +10930,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10930 | { | 10930 | { |
| 10931 | UUID rq = UUID.Random(); | 10931 | UUID rq = UUID.Random(); |
| 10932 | 10932 | ||
| 10933 | UUID tid = AsyncCommands. | 10933 | AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString()); |
| 10934 | DataserverPlugin.RegisterRequest(m_localID, | ||
| 10935 | m_itemID, rq.ToString()); | ||
| 10936 | 10934 | ||
| 10937 | AsyncCommands. | 10935 | AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), Name2Username(llKey2Name(id))); |
| 10938 | DataserverPlugin.DataserverReply(rq.ToString(), Name2Username(llKey2Name(id))); | ||
| 10939 | 10936 | ||
| 10940 | return rq.ToString(); | 10937 | return rq.ToString(); |
| 10941 | } | 10938 | } |
| @@ -10949,12 +10946,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10949 | { | 10946 | { |
| 10950 | UUID rq = UUID.Random(); | 10947 | UUID rq = UUID.Random(); |
| 10951 | 10948 | ||
| 10952 | UUID tid = AsyncCommands. | 10949 | AsyncCommands.DataserverPlugin.RegisterRequest(m_localID, m_itemID, rq.ToString()); |
| 10953 | DataserverPlugin.RegisterRequest(m_localID, | ||
| 10954 | m_itemID, rq.ToString()); | ||
| 10955 | 10950 | ||
| 10956 | AsyncCommands. | 10951 | AsyncCommands.DataserverPlugin.DataserverReply(rq.ToString(), llKey2Name(id)); |
| 10957 | DataserverPlugin.DataserverReply(rq.ToString(), llKey2Name(id)); | ||
| 10958 | 10952 | ||
| 10959 | return rq.ToString(); | 10953 | return rq.ToString(); |
| 10960 | } | 10954 | } |