diff options
author | Diva Canto | 2010-01-10 19:42:36 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 19:42:36 -0800 |
commit | 0c2946031bccf75c28968b6adcde5cce5bc45c13 (patch) | |
tree | a57253af1e81c82ce52dbc44babe60d2defe27fb /OpenSim/Region/Framework | |
parent | Moved GridInfo service from where it was to Handlers/Grid (diff) | |
download | opensim-SC_OLD-0c2946031bccf75c28968b6adcde5cce5bc45c13.zip opensim-SC_OLD-0c2946031bccf75c28968b6adcde5cce5bc45c13.tar.gz opensim-SC_OLD-0c2946031bccf75c28968b6adcde5cce5bc45c13.tar.bz2 opensim-SC_OLD-0c2946031bccf75c28968b6adcde5cce5bc45c13.tar.xz |
CommunicationsManager is practically empty. Only NetworkServersInfo is there.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
3 files changed, 15 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index fbb7660..bbb1938 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -332,14 +332,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
332 | { | 332 | { |
333 | //EventManager.TriggerAvatarPickerRequest(); | 333 | //EventManager.TriggerAvatarPickerRequest(); |
334 | 334 | ||
335 | List<AvatarPickerAvatar> AvatarResponses = new List<AvatarPickerAvatar>(); | 335 | List<UserAccount> accounts = UserAccountService.GetUserAccounts(RegionInfo.ScopeID, query); |
336 | AvatarResponses = m_sceneGridService.GenerateAgentPickerRequestResponse(RequestID, query); | 336 | |
337 | if (accounts == null) | ||
338 | return; | ||
337 | 339 | ||
338 | AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); | 340 | AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket) PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply); |
339 | // TODO: don't create new blocks if recycling an old packet | 341 | // TODO: don't create new blocks if recycling an old packet |
340 | 342 | ||
341 | AvatarPickerReplyPacket.DataBlock[] searchData = | 343 | AvatarPickerReplyPacket.DataBlock[] searchData = |
342 | new AvatarPickerReplyPacket.DataBlock[AvatarResponses.Count]; | 344 | new AvatarPickerReplyPacket.DataBlock[accounts.Count]; |
343 | AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock(); | 345 | AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock(); |
344 | 346 | ||
345 | agentData.AgentID = avatarID; | 347 | agentData.AgentID = avatarID; |
@@ -348,16 +350,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
348 | //byte[] bytes = new byte[AvatarResponses.Count*32]; | 350 | //byte[] bytes = new byte[AvatarResponses.Count*32]; |
349 | 351 | ||
350 | int i = 0; | 352 | int i = 0; |
351 | foreach (AvatarPickerAvatar item in AvatarResponses) | 353 | foreach (UserAccount item in accounts) |
352 | { | 354 | { |
353 | UUID translatedIDtem = item.AvatarID; | 355 | UUID translatedIDtem = item.PrincipalID; |
354 | searchData[i] = new AvatarPickerReplyPacket.DataBlock(); | 356 | searchData[i] = new AvatarPickerReplyPacket.DataBlock(); |
355 | searchData[i].AvatarID = translatedIDtem; | 357 | searchData[i].AvatarID = translatedIDtem; |
356 | searchData[i].FirstName = Utils.StringToBytes((string) item.firstName); | 358 | searchData[i].FirstName = Utils.StringToBytes((string) item.FirstName); |
357 | searchData[i].LastName = Utils.StringToBytes((string) item.lastName); | 359 | searchData[i].LastName = Utils.StringToBytes((string) item.LastName); |
358 | i++; | 360 | i++; |
359 | } | 361 | } |
360 | if (AvatarResponses.Count == 0) | 362 | if (accounts.Count == 0) |
361 | { | 363 | { |
362 | searchData = new AvatarPickerReplyPacket.DataBlock[0]; | 364 | searchData = new AvatarPickerReplyPacket.DataBlock[0]; |
363 | } | 365 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 04ecb5f..2e82748 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -1443,12 +1443,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1443 | 1443 | ||
1444 | //m_log.DebugFormat("[SCENE COMM]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname); | 1444 | //m_log.DebugFormat("[SCENE COMM]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname); |
1445 | } | 1445 | } |
1446 | 1446 | ||
1447 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query) | ||
1448 | { | ||
1449 | return m_commsProvider.GenerateAgentPickerRequestResponse(queryID, query); | ||
1450 | } | ||
1451 | |||
1452 | public List<GridRegion> RequestNamedRegions(string name, int maxNumber) | 1447 | public List<GridRegion> RequestNamedRegions(string name, int maxNumber) |
1453 | { | 1448 | { |
1454 | return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); | 1449 | return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 97415f4..09b53d2 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2573,7 +2573,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2573 | m_appearance.SetAppearance(textureEntry, visualParams); | 2573 | m_appearance.SetAppearance(textureEntry, visualParams); |
2574 | if (m_appearance.AvatarHeight > 0) | 2574 | if (m_appearance.AvatarHeight > 0) |
2575 | SetHeight(m_appearance.AvatarHeight); | 2575 | SetHeight(m_appearance.AvatarHeight); |
2576 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); | 2576 | AvatarData adata = new AvatarData(m_appearance); |
2577 | m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata); | ||
2577 | 2578 | ||
2578 | SendAppearanceToAllOtherAgents(); | 2579 | SendAppearanceToAllOtherAgents(); |
2579 | if (!m_startAnimationSet) | 2580 | if (!m_startAnimationSet) |
@@ -2593,7 +2594,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2593 | public void SetWearable(int wearableId, AvatarWearable wearable) | 2594 | public void SetWearable(int wearableId, AvatarWearable wearable) |
2594 | { | 2595 | { |
2595 | m_appearance.SetWearable(wearableId, wearable); | 2596 | m_appearance.SetWearable(wearableId, wearable); |
2596 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); | 2597 | AvatarData adata = new AvatarData(m_appearance); |
2598 | m_scene.AvatarService.SetAvatar(m_controllingClient.AgentId, adata); | ||
2597 | m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 2599 | m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
2598 | } | 2600 | } |
2599 | 2601 | ||