diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs index 546d9d1..b38ddba 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs | |||
@@ -71,11 +71,11 @@ namespace OpenSim.Region.Environment | |||
71 | return llsdEvent; | 71 | return llsdEvent; |
72 | } | 72 | } |
73 | 73 | ||
74 | public static OSD EnableSimulator(ulong Handle, IPEndPoint endPoint) | 74 | public static OSD EnableSimulator(ulong handle, IPEndPoint endPoint) |
75 | { | 75 | { |
76 | OSDMap llsdSimInfo = new OSDMap(3); | 76 | OSDMap llsdSimInfo = new OSDMap(3); |
77 | 77 | ||
78 | llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(Handle))); | 78 | llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle))); |
79 | llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); | 79 | llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); |
80 | llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); | 80 | llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); |
81 | 81 | ||
@@ -88,11 +88,11 @@ namespace OpenSim.Region.Environment | |||
88 | return buildEvent("EnableSimulator", llsdBody); | 88 | return buildEvent("EnableSimulator", llsdBody); |
89 | } | 89 | } |
90 | 90 | ||
91 | public static OSD DisableSimulator(ulong Handle) | 91 | public static OSD DisableSimulator(ulong handle) |
92 | { | 92 | { |
93 | //OSDMap llsdSimInfo = new OSDMap(1); | 93 | //OSDMap llsdSimInfo = new OSDMap(1); |
94 | 94 | ||
95 | //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle))); | 95 | //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(handle))); |
96 | 96 | ||
97 | //OSDArray arr = new OSDArray(1); | 97 | //OSDArray arr = new OSDArray(1); |
98 | //arr.Add(llsdSimInfo); | 98 | //arr.Add(llsdSimInfo); |
@@ -103,57 +103,57 @@ namespace OpenSim.Region.Environment | |||
103 | return buildEvent("DisableSimulator", llsdBody); | 103 | return buildEvent("DisableSimulator", llsdBody); |
104 | } | 104 | } |
105 | 105 | ||
106 | public static OSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt, | 106 | public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, |
107 | IPEndPoint newRegionExternalEndPoint, | 107 | IPEndPoint newRegionExternalEndPoint, |
108 | string capsURL, UUID AgentID, UUID SessionID) | 108 | string capsURL, UUID agentID, UUID sessionID) |
109 | { | 109 | { |
110 | OSDArray LookAtArr = new OSDArray(3); | 110 | OSDArray lookAtArr = new OSDArray(3); |
111 | LookAtArr.Add(OSD.FromReal(lookAt.X)); | 111 | lookAtArr.Add(OSD.FromReal(lookAt.X)); |
112 | LookAtArr.Add(OSD.FromReal(lookAt.Y)); | 112 | lookAtArr.Add(OSD.FromReal(lookAt.Y)); |
113 | LookAtArr.Add(OSD.FromReal(lookAt.Z)); | 113 | lookAtArr.Add(OSD.FromReal(lookAt.Z)); |
114 | 114 | ||
115 | OSDArray PositionArr = new OSDArray(3); | 115 | OSDArray positionArr = new OSDArray(3); |
116 | PositionArr.Add(OSD.FromReal(pos.X)); | 116 | positionArr.Add(OSD.FromReal(pos.X)); |
117 | PositionArr.Add(OSD.FromReal(pos.Y)); | 117 | positionArr.Add(OSD.FromReal(pos.Y)); |
118 | PositionArr.Add(OSD.FromReal(pos.Z)); | 118 | positionArr.Add(OSD.FromReal(pos.Z)); |
119 | 119 | ||
120 | OSDMap InfoMap = new OSDMap(2); | 120 | OSDMap infoMap = new OSDMap(2); |
121 | InfoMap.Add("LookAt", LookAtArr); | 121 | infoMap.Add("LookAt", lookAtArr); |
122 | InfoMap.Add("Position", PositionArr); | 122 | infoMap.Add("Position", positionArr); |
123 | 123 | ||
124 | OSDArray InfoArr = new OSDArray(1); | 124 | OSDArray infoArr = new OSDArray(1); |
125 | InfoArr.Add(InfoMap); | 125 | infoArr.Add(infoMap); |
126 | 126 | ||
127 | OSDMap AgentDataMap = new OSDMap(2); | 127 | OSDMap agentDataMap = new OSDMap(2); |
128 | AgentDataMap.Add("AgentID", OSD.FromUUID(AgentID)); | 128 | agentDataMap.Add("AgentID", OSD.FromUUID(agentID)); |
129 | AgentDataMap.Add("SessionID", OSD.FromUUID(SessionID)); | 129 | agentDataMap.Add("SessionID", OSD.FromUUID(sessionID)); |
130 | 130 | ||
131 | OSDArray AgentDataArr = new OSDArray(1); | 131 | OSDArray agentDataArr = new OSDArray(1); |
132 | AgentDataArr.Add(AgentDataMap); | 132 | agentDataArr.Add(agentDataMap); |
133 | 133 | ||
134 | OSDMap RegionDataMap = new OSDMap(4); | 134 | OSDMap regionDataMap = new OSDMap(4); |
135 | RegionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(Handle))); | 135 | regionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(handle))); |
136 | RegionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); | 136 | regionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); |
137 | RegionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); | 137 | regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); |
138 | RegionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); | 138 | regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); |
139 | 139 | ||
140 | OSDArray RegionDataArr = new OSDArray(1); | 140 | OSDArray regionDataArr = new OSDArray(1); |
141 | RegionDataArr.Add(RegionDataMap); | 141 | regionDataArr.Add(regionDataMap); |
142 | 142 | ||
143 | OSDMap llsdBody = new OSDMap(3); | 143 | OSDMap llsdBody = new OSDMap(3); |
144 | llsdBody.Add("Info", InfoArr); | 144 | llsdBody.Add("Info", infoArr); |
145 | llsdBody.Add("AgentData", AgentDataArr); | 145 | llsdBody.Add("AgentData", agentDataArr); |
146 | llsdBody.Add("RegionData", RegionDataArr); | 146 | llsdBody.Add("RegionData", regionDataArr); |
147 | 147 | ||
148 | return buildEvent("CrossedRegion", llsdBody); | 148 | return buildEvent("CrossedRegion", llsdBody); |
149 | } | 149 | } |
150 | 150 | ||
151 | public static OSD TeleportFinishEvent( | 151 | public static OSD TeleportFinishEvent( |
152 | ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, | 152 | ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, |
153 | uint locationID, uint flags, string capsURL, UUID AgentID) | 153 | uint locationID, uint flags, string capsURL, UUID agentID) |
154 | { | 154 | { |
155 | OSDMap info = new OSDMap(); | 155 | OSDMap info = new OSDMap(); |
156 | info.Add("AgentID", OSD.FromUUID(AgentID)); | 156 | info.Add("AgentID", OSD.FromUUID(agentID)); |
157 | info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? | 157 | info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? |
158 | info.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(regionHandle))); | 158 | info.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(regionHandle))); |
159 | info.Add("SeedCapability", OSD.FromString(capsURL)); | 159 | info.Add("SeedCapability", OSD.FromString(capsURL)); |