diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f435681..3e7b820 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -529,6 +529,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
529 | m_estateManager.sendRegionHandshake(client); | 529 | m_estateManager.sendRegionHandshake(client); |
530 | CreateAndAddScenePresence(client); | 530 | CreateAndAddScenePresence(client); |
531 | m_LandManager.sendParcelOverlay(client); | 531 | m_LandManager.sendParcelOverlay(client); |
532 | //commsManager.UserProfilesCache.AddNewUser(client.AgentId); | ||
532 | } | 533 | } |
533 | 534 | ||
534 | protected virtual void SubscribeToClientEvents(IClientAPI client) | 535 | protected virtual void SubscribeToClientEvents(IClientAPI client) |
@@ -569,6 +570,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
569 | new ParcelObjectOwnerRequest(m_LandManager.handleParcelObjectOwnersRequest); | 570 | new ParcelObjectOwnerRequest(m_LandManager.handleParcelObjectOwnersRequest); |
570 | 571 | ||
571 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); | 572 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); |
573 | |||
574 | //client.OnCreateNewInventoryFolder += commsManager.UserProfilesCache.HandleCreateInventoryFolder; | ||
575 | // client.OnFetchInventoryDescendents += commsManager.UserProfilesCache.HandleFecthInventoryDescendents; | ||
572 | } | 576 | } |
573 | 577 | ||
574 | protected ScenePresence CreateAndAddScenePresence(IClientAPI client) | 578 | protected ScenePresence CreateAndAddScenePresence(IClientAPI client) |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 3bfc70f..473dae9 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
53 | private List<NewForce> forcesList = new List<NewForce>(); | 53 | private List<NewForce> forcesList = new List<NewForce>(); |
54 | private short _updateCount = 0; | 54 | private short _updateCount = 0; |
55 | private Quaternion bodyRot; | 55 | private Quaternion bodyRot; |
56 | private LLObject.TextureEntry avatarAppearanceTexture = null; | 56 | // private LLObject.TextureEntry avatarAppearanceTexture = null; |
57 | private byte[] visualParams; | 57 | private byte[] visualParams; |
58 | private AvatarWearable[] Wearables; | 58 | private AvatarWearable[] Wearables; |
59 | private ulong m_regionHandle; | 59 | private ulong m_regionHandle; |
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
140 | Animations = new ScenePresence.AvatarAnimations(); | 140 | Animations = new ScenePresence.AvatarAnimations(); |
141 | Animations.LoadAnims(); | 141 | Animations.LoadAnims(); |
142 | 142 | ||
143 | this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); | 143 | // this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); |
144 | 144 | ||
145 | //register for events | 145 | //register for events |
146 | ControllingClient.OnRequestWearables += this.SendOurAppearance; | 146 | ControllingClient.OnRequestWearables += this.SendOurAppearance; |
@@ -605,6 +605,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
605 | br.Close(); | 605 | br.Close(); |
606 | fStream.Close(); | 606 | fStream.Close(); |
607 | DefaultTexture = data1; | 607 | DefaultTexture = data1; |
608 | // LLObject.TextureEntry textu = new LLObject.TextureEntry(data1, 0, data1.Length); | ||
609 | // Console.WriteLine("default texture entry: " + textu.ToString()); | ||
608 | } | 610 | } |
609 | 611 | ||
610 | public class NewForce | 612 | public class NewForce |