diff options
author | Teravus Ovares | 2008-09-06 22:28:51 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 22:28:51 +0000 |
commit | 3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe (patch) | |
tree | 78f306a05c126927d06936cd87ef9e6e0a1cdaf7 /OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |
parent | Mantis#1234. Thank you HomerHorwitz for a patch that: (diff) | |
download | opensim-SC-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.zip opensim-SC-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.gz opensim-SC-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.bz2 opensim-SC-3378b502c5c02de2cc0d9d73bd24aecafa5dd3fe.tar.xz |
* This changes gridcomms types back to our home grown wholy controlled types.
* These are different types then the OMV types because changing them causes just about all grid comms to break. If these were the libOMV types, then libOMV couldn't change them ever again after that.. or we'd have a breakage whenever they changed them.
* This might introduce a map issue. Still checking it out.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 1dd4219..a3bcc26 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -1212,7 +1212,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1212 | if (remObject != null) | 1212 | if (remObject != null) |
1213 | { | 1213 | { |
1214 | retValue = | 1214 | retValue = |
1215 | remObject.ExpectAvatarCrossing(regionHandle, agentID.Guid, position, | 1215 | remObject.ExpectAvatarCrossing(regionHandle, agentID.Guid, new sLLVector3(position), |
1216 | isFlying); | 1216 | isFlying); |
1217 | } | 1217 | } |
1218 | else | 1218 | else |
@@ -1269,7 +1269,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1269 | if (remObject != null) | 1269 | if (remObject != null) |
1270 | { | 1270 | { |
1271 | retValue = | 1271 | retValue = |
1272 | remObject.ExpectAvatarCrossing(regionHandle, agentID.Guid, position, | 1272 | remObject.ExpectAvatarCrossing(regionHandle, agentID.Guid, new sLLVector3(position), |
1273 | isPhysical); | 1273 | isPhysical); |
1274 | } | 1274 | } |
1275 | else | 1275 | else |
@@ -1739,7 +1739,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1739 | if (landData != null) | 1739 | if (landData != null) |
1740 | { | 1740 | { |
1741 | // for now, only push out the data we need for answering a ParcelInfoReqeust | 1741 | // for now, only push out the data we need for answering a ParcelInfoReqeust |
1742 | // FIXME: these Replace calls are necessary as Vector3.Parse can't parse vectors with spaces in them. Can be removed as soon as we switch to a newer version | 1742 | // FIXME: these Replace calls are necessary as LLVector3.Parse can't parse vectors with spaces in them. Can be removed as soon as we switch to a newer version |
1743 | hash["AABBMax"] = landData.AABBMax.ToString().Replace(" ", ""); | 1743 | hash["AABBMax"] = landData.AABBMax.ToString().Replace(" ", ""); |
1744 | hash["AABBMin"] = landData.AABBMin.ToString().Replace(" ", ""); | 1744 | hash["AABBMin"] = landData.AABBMin.ToString().Replace(" ", ""); |
1745 | hash["Area"] = landData.Area.ToString(); | 1745 | hash["Area"] = landData.Area.ToString(); |