diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs index 77cc7ea..378610a 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using libsecondlife; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins | 33 | namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins |
34 | 34 | ||
@@ -48,28 +48,28 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
48 | private class DataserverRequest | 48 | private class DataserverRequest |
49 | { | 49 | { |
50 | public uint localID; | 50 | public uint localID; |
51 | public LLUUID itemID; | 51 | public UUID itemID; |
52 | 52 | ||
53 | public LLUUID ID; | 53 | public UUID ID; |
54 | public string handle; | 54 | public string handle; |
55 | 55 | ||
56 | public DateTime startTime; | 56 | public DateTime startTime; |
57 | } | 57 | } |
58 | 58 | ||
59 | public LLUUID RegisterRequest(uint localID, LLUUID itemID, | 59 | public UUID RegisterRequest(uint localID, UUID itemID, |
60 | string identifier) | 60 | string identifier) |
61 | { | 61 | { |
62 | lock (DataserverRequests) | 62 | lock (DataserverRequests) |
63 | { | 63 | { |
64 | if (DataserverRequests.ContainsKey(identifier)) | 64 | if (DataserverRequests.ContainsKey(identifier)) |
65 | return LLUUID.Zero; | 65 | return UUID.Zero; |
66 | 66 | ||
67 | DataserverRequest ds = new DataserverRequest(); | 67 | DataserverRequest ds = new DataserverRequest(); |
68 | 68 | ||
69 | ds.localID = localID; | 69 | ds.localID = localID; |
70 | ds.itemID = itemID; | 70 | ds.itemID = itemID; |
71 | 71 | ||
72 | ds.ID = LLUUID.Random(); | 72 | ds.ID = UUID.Random(); |
73 | ds.handle = identifier; | 73 | ds.handle = identifier; |
74 | 74 | ||
75 | ds.startTime = DateTime.Now; | 75 | ds.startTime = DateTime.Now; |
@@ -99,7 +99,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
99 | new LSL_Types.LSLString(reply)}); | 99 | new LSL_Types.LSLString(reply)}); |
100 | } | 100 | } |
101 | 101 | ||
102 | public void RemoveEvents(uint localID, LLUUID itemID) | 102 | public void RemoveEvents(uint localID, UUID itemID) |
103 | { | 103 | { |
104 | lock (DataserverRequests) | 104 | lock (DataserverRequests) |
105 | { | 105 | { |