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/Shared/Api/Implementation/Plugins/Timer.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/Shared/Api/Implementation/Plugins/Timer.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs index 36e992b..ec7cd35 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.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 | using OpenSim.Region.ScriptEngine.Shared.Api; | 32 | using OpenSim.Region.ScriptEngine.Shared.Api; |
33 | 33 | ||
34 | namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | 34 | namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins |
@@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
48 | private class TimerClass | 48 | private class TimerClass |
49 | { | 49 | { |
50 | public uint localID; | 50 | public uint localID; |
51 | public LLUUID itemID; | 51 | public UUID itemID; |
52 | //public double interval; | 52 | //public double interval; |
53 | public long interval; | 53 | public long interval; |
54 | //public DateTime next; | 54 | //public DateTime next; |
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
58 | private List<TimerClass> Timers = new List<TimerClass>(); | 58 | private List<TimerClass> Timers = new List<TimerClass>(); |
59 | private object TimerListLock = new object(); | 59 | private object TimerListLock = new object(); |
60 | 60 | ||
61 | public void SetTimerEvent(uint m_localID, LLUUID m_itemID, double sec) | 61 | public void SetTimerEvent(uint m_localID, UUID m_itemID, double sec) |
62 | { | 62 | { |
63 | // Always remove first, in case this is a re-set | 63 | // Always remove first, in case this is a re-set |
64 | UnSetTimerEvents(m_localID, m_itemID); | 64 | UnSetTimerEvents(m_localID, m_itemID); |
@@ -81,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
81 | } | 81 | } |
82 | } | 82 | } |
83 | 83 | ||
84 | public void UnSetTimerEvents(uint m_localID, LLUUID m_itemID) | 84 | public void UnSetTimerEvents(uint m_localID, UUID m_itemID) |
85 | { | 85 | { |
86 | // Remove from timer | 86 | // Remove from timer |
87 | lock (TimerListLock) | 87 | lock (TimerListLock) |
@@ -122,7 +122,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
125 | public Object[] GetSerializationData(LLUUID itemID) | 125 | public Object[] GetSerializationData(UUID itemID) |
126 | { | 126 | { |
127 | List<Object> data = new List<Object>(); | 127 | List<Object> data = new List<Object>(); |
128 | 128 | ||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
140 | return data.ToArray(); | 140 | return data.ToArray(); |
141 | } | 141 | } |
142 | 142 | ||
143 | public void CreateFromData(uint localID, LLUUID itemID, LLUUID objectID, | 143 | public void CreateFromData(uint localID, UUID itemID, UUID objectID, |
144 | Object[] data) | 144 | Object[] data) |
145 | { | 145 | { |
146 | int idx = 0; | 146 | int idx = 0; |