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/Framework/RegionCommsListener.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 'OpenSim/Framework/RegionCommsListener.cs')
-rw-r--r-- | OpenSim/Framework/RegionCommsListener.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index 2d0be15..5d3c2fe 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
33 | { | 33 | { |
@@ -84,7 +84,7 @@ namespace OpenSim.Framework | |||
84 | } | 84 | } |
85 | 85 | ||
86 | // From User Server | 86 | // From User Server |
87 | public virtual void TriggerLogOffUser(ulong regionHandle, LLUUID agentID, LLUUID RegionSecret, string message) | 87 | public virtual void TriggerLogOffUser(ulong regionHandle, UUID agentID, UUID RegionSecret, string message) |
88 | { | 88 | { |
89 | handlerLogOffUser = OnLogOffUser; | 89 | handlerLogOffUser = OnLogOffUser; |
90 | if (handlerLogOffUser != null) | 90 | if (handlerLogOffUser != null) |
@@ -95,7 +95,7 @@ namespace OpenSim.Framework | |||
95 | } | 95 | } |
96 | 96 | ||
97 | 97 | ||
98 | public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) | 98 | public virtual bool TriggerExpectPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod) |
99 | { | 99 | { |
100 | handlerExpectPrim = OnExpectPrim; | 100 | handlerExpectPrim = OnExpectPrim; |
101 | if (handlerExpectPrim != null) | 101 | if (handlerExpectPrim != null) |
@@ -128,7 +128,7 @@ namespace OpenSim.Framework | |||
128 | return false; | 128 | return false; |
129 | } | 129 | } |
130 | 130 | ||
131 | public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, | 131 | public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, |
132 | bool isFlying) | 132 | bool isFlying) |
133 | { | 133 | { |
134 | handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion; | 134 | handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion; |
@@ -140,7 +140,7 @@ namespace OpenSim.Framework | |||
140 | return false; | 140 | return false; |
141 | } | 141 | } |
142 | 142 | ||
143 | public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, | 143 | public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, UUID primID, Vector3 position, |
144 | bool isPhysical) | 144 | bool isPhysical) |
145 | { | 145 | { |
146 | handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion; | 146 | handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion; |
@@ -152,7 +152,7 @@ namespace OpenSim.Framework | |||
152 | return false; | 152 | return false; |
153 | } | 153 | } |
154 | 154 | ||
155 | public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID) | 155 | public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, UUID agentID) |
156 | { | 156 | { |
157 | handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed; | 157 | handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed; |
158 | if (handlerAcknowledgeAgentCrossed != null) | 158 | if (handlerAcknowledgeAgentCrossed != null) |
@@ -163,7 +163,7 @@ namespace OpenSim.Framework | |||
163 | return false; | 163 | return false; |
164 | } | 164 | } |
165 | 165 | ||
166 | public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) | 166 | public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, UUID primID) |
167 | { | 167 | { |
168 | handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed; | 168 | handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed; |
169 | if (handlerAcknowledgePrimCrossed != null) | 169 | if (handlerAcknowledgePrimCrossed != null) |
@@ -174,7 +174,7 @@ namespace OpenSim.Framework | |||
174 | return false; | 174 | return false; |
175 | } | 175 | } |
176 | 176 | ||
177 | public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) | 177 | public virtual bool TriggerCloseAgentConnection(ulong regionHandle, UUID agentID) |
178 | { | 178 | { |
179 | handlerCloseAgentConnection = OnCloseAgentConnection; | 179 | handlerCloseAgentConnection = OnCloseAgentConnection; |
180 | if (handlerCloseAgentConnection != null) | 180 | if (handlerCloseAgentConnection != null) |
@@ -220,7 +220,7 @@ namespace OpenSim.Framework | |||
220 | return false; | 220 | return false; |
221 | } | 221 | } |
222 | 222 | ||
223 | public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) | 223 | public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID) |
224 | { | 224 | { |
225 | handlerCloseAgentConnection = OnCloseAgentConnection; | 225 | handlerCloseAgentConnection = OnCloseAgentConnection; |
226 | if (handlerCloseAgentConnection != null) | 226 | if (handlerCloseAgentConnection != null) |