diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 6a7c266..999b70f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -29,8 +29,6 @@ using System.Collections.Generic; | |||
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using libsecondlife.Packets; | 30 | using libsecondlife.Packets; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.UserManagement; | ||
33 | using OpenSim.Framework.Console; | ||
34 | 32 | ||
35 | namespace OpenSim.Region.Environment.Scenes | 33 | namespace OpenSim.Region.Environment.Scenes |
36 | { | 34 | { |
@@ -45,7 +43,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
45 | /// <param name="action">The action to be performed</param> | 43 | /// <param name="action">The action to be performed</param> |
46 | /// <param name="north">Distance from the north border where the cursor is located</param> | 44 | /// <param name="north">Distance from the north border where the cursor is located</param> |
47 | /// <param name="west">Distance from the west border where the cursor is located</param> | 45 | /// <param name="west">Distance from the west border where the cursor is located</param> |
48 | public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west, float south, float east, | 46 | public void ModifyTerrain(float height, float seconds, byte brushsize, byte action, float north, float west, |
47 | float south, float east, | ||
49 | IClientAPI remoteUser) | 48 | IClientAPI remoteUser) |
50 | { | 49 | { |
51 | // Do a permissions check before allowing terraforming. | 50 | // Do a permissions check before allowing terraforming. |
@@ -157,7 +156,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
157 | } | 156 | } |
158 | } | 157 | } |
159 | } | 158 | } |
160 | 159 | ||
161 | public void ProcessAvatarPickerRequest(IClientAPI client, LLUUID avatarID, LLUUID RequestID, string query) | 160 | public void ProcessAvatarPickerRequest(IClientAPI client, LLUUID avatarID, LLUUID RequestID, string query) |
162 | { | 161 | { |
163 | //EventManager.TriggerAvatarPickerRequest(); | 162 | //EventManager.TriggerAvatarPickerRequest(); |
@@ -166,13 +165,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
166 | AvatarResponses = CommsManager.GenerateAgentPickerRequestResponse(RequestID, query); | 165 | AvatarResponses = CommsManager.GenerateAgentPickerRequestResponse(RequestID, query); |
167 | 166 | ||
168 | AvatarPickerReplyPacket replyPacket = new AvatarPickerReplyPacket(); | 167 | AvatarPickerReplyPacket replyPacket = new AvatarPickerReplyPacket(); |
169 | AvatarPickerReplyPacket.DataBlock[] searchData = new AvatarPickerReplyPacket.DataBlock[AvatarResponses.Count]; | 168 | AvatarPickerReplyPacket.DataBlock[] searchData = |
169 | new AvatarPickerReplyPacket.DataBlock[AvatarResponses.Count]; | ||
170 | AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock(); | 170 | AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock(); |
171 | 171 | ||
172 | agentData.AgentID = avatarID; | 172 | agentData.AgentID = avatarID; |
173 | agentData.QueryID = RequestID; | 173 | agentData.QueryID = RequestID; |
174 | replyPacket.AgentData = agentData; | 174 | replyPacket.AgentData = agentData; |
175 | byte[] bytes = new byte[AvatarResponses.Count * 32]; | 175 | byte[] bytes = new byte[AvatarResponses.Count*32]; |
176 | 176 | ||
177 | int i = 0; | 177 | int i = 0; |
178 | foreach (AvatarPickerAvatar item in AvatarResponses) | 178 | foreach (AvatarPickerAvatar item in AvatarResponses) |
@@ -180,10 +180,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
180 | LLUUID translatedIDtem = item.AvatarID; | 180 | LLUUID translatedIDtem = item.AvatarID; |
181 | searchData[i] = new AvatarPickerReplyPacket.DataBlock(); | 181 | searchData[i] = new AvatarPickerReplyPacket.DataBlock(); |
182 | searchData[i].AvatarID = translatedIDtem; | 182 | searchData[i].AvatarID = translatedIDtem; |
183 | searchData[i].FirstName = Helpers.StringToField((string)item.firstName); | 183 | searchData[i].FirstName = Helpers.StringToField((string) item.firstName); |
184 | searchData[i].LastName = Helpers.StringToField((string)item.lastName); | 184 | searchData[i].LastName = Helpers.StringToField((string) item.lastName); |
185 | i++; | 185 | i++; |
186 | |||
187 | } | 186 | } |
188 | if (AvatarResponses.Count == 0) | 187 | if (AvatarResponses.Count == 0) |
189 | { | 188 | { |
@@ -193,4 +192,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
193 | client.SendAvatarPickerReply(replyPacket); | 192 | client.SendAvatarPickerReply(replyPacket); |
194 | } | 193 | } |
195 | } | 194 | } |
196 | } | 195 | } \ No newline at end of file |