From b2c6f316e16e9bb33f81997319a4130fa683bc48 Mon Sep 17 00:00:00 2001 From: MW Date: Thu, 19 Jul 2007 20:21:02 +0000 Subject: Some work on Inventory (not yet finished or enabled) --- OpenSim/Region/Environment/Scenes/Scene.cs | 4 ++++ OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes') 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 m_estateManager.sendRegionHandshake(client); CreateAndAddScenePresence(client); m_LandManager.sendParcelOverlay(client); + //commsManager.UserProfilesCache.AddNewUser(client.AgentId); } protected virtual void SubscribeToClientEvents(IClientAPI client) @@ -569,6 +570,9 @@ namespace OpenSim.Region.Environment.Scenes new ParcelObjectOwnerRequest(m_LandManager.handleParcelObjectOwnersRequest); client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); + + //client.OnCreateNewInventoryFolder += commsManager.UserProfilesCache.HandleCreateInventoryFolder; + // client.OnFetchInventoryDescendents += commsManager.UserProfilesCache.HandleFecthInventoryDescendents; } 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 private List forcesList = new List(); private short _updateCount = 0; private Quaternion bodyRot; - private LLObject.TextureEntry avatarAppearanceTexture = null; + // private LLObject.TextureEntry avatarAppearanceTexture = null; private byte[] visualParams; private AvatarWearable[] Wearables; private ulong m_regionHandle; @@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Scenes Animations = new ScenePresence.AvatarAnimations(); Animations.LoadAnims(); - this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); + // this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); //register for events ControllingClient.OnRequestWearables += this.SendOurAppearance; @@ -605,6 +605,8 @@ namespace OpenSim.Region.Environment.Scenes br.Close(); fStream.Close(); DefaultTexture = data1; + // LLObject.TextureEntry textu = new LLObject.TextureEntry(data1, 0, data1.Length); + // Console.WriteLine("default texture entry: " + textu.ToString()); } public class NewForce -- cgit v1.1