From 6e1be3931592c8d45efac59580af6c5dd35c5426 Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 30 May 2007 18:03:27 +0000 Subject: [PATCH] trying to get login to work --- .../ClientView.ProcessPackets.cs | 93 +++++++++++++++---- OpenSim/OpenSim.RegionServer/ClientView.cs | 8 +- OpenSim/OpenSim.RegionServer/PacketServer.cs | 2 +- OpenSim/OpenSim.World/Avatar.cs | 6 +- OpenSim/OpenSim/OpenSimMain.cs | 2 +- 5 files changed, 83 insertions(+), 28 deletions(-) diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs index 54cb662ca5..0964fc4d4f 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs @@ -38,7 +38,10 @@ namespace OpenSim else { System.Text.Encoding _enc = System.Text.Encoding.ASCII; - + if (Pack.Type != PacketType.PacketAck) + { + Console.WriteLine(Pack.Type.ToString()); + } switch (Pack.Type) { case PacketType.ViewerEffect: @@ -67,7 +70,10 @@ namespace OpenSim byte type = inchatpack.ChatData.Type; LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; LLUUID fromAgentID = AgentID; - this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID); + if (OnChatFromViewer != null) + { + this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID); + } break; case PacketType.RezObject: RezObjectPacket rezPacket = (RezObjectPacket)Pack; @@ -79,40 +85,67 @@ namespace OpenSim AssetBase asset = this.m_assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID); if (asset != null) { - this.OnRezObject(asset, rezPacket.RezData.RayEnd); - this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID); + if (OnRezObject != null) + { + this.OnRezObject(asset, rezPacket.RezData.RayEnd); + this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID); + } } } } break; case PacketType.DeRezObject: - OnDeRezObject(Pack, this); + if (OnDeRezObject != null) + { + OnDeRezObject(Pack, this); + } break; case PacketType.ModifyLand: ModifyLandPacket modify = (ModifyLandPacket)Pack; if (modify.ParcelData.Length > 0) { - OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West); + if (OnModifyTerrain != null) + { + OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West); + } } break; case PacketType.RegionHandshakeReply: - OnRegionHandShakeReply(this); + if (OnRegionHandShakeReply != null) + { + OnRegionHandShakeReply(this); + } break; case PacketType.AgentWearablesRequest: - OnRequestWearables(this); - OnRequestAvatarsData(this); + if (OnRequestWearables != null) + { + OnRequestWearables(this); + } + if (OnRequestAvatarsData != null) + { + OnRequestAvatarsData(this); + } break; case PacketType.AgentSetAppearance: AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack; - OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam); + if (OnSetAppearance != null) + { + OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam); + } break; case PacketType.CompleteAgentMovement: if (this.m_child) this.UpgradeClient(); - OnCompleteMovementToRegion(); + if (OnCompleteMovementToRegion != null) + { + OnCompleteMovementToRegion(); + } this.EnableNeighbours(); break; case PacketType.AgentUpdate: - OnAgentUpdate(Pack); + if (OnAgentUpdate != null) + { + OnAgentUpdate(Pack); + } break; case PacketType.AgentAnimation: if (!m_child) @@ -122,7 +155,10 @@ namespace OpenSim { if (AgentAni.AnimationList[i].StartAnim) { - OnStartAnim(AgentAni.AnimationList[i].AnimID, 1); + if (OnStartAnim != null) + { + OnStartAnim(AgentAni.AnimationList[i].AnimID, 1); + } } } } @@ -145,36 +181,53 @@ namespace OpenSim childrenprims.Add(link.ObjectData[i].ObjectLocalID); } } - OnLinkObjects(parentprimid, childrenprims); + if (OnLinkObjects != null) + { + OnLinkObjects(parentprimid, childrenprims); + } break; case PacketType.ObjectAdd: // m_world.AddNewPrim((ObjectAddPacket)Pack, this); - OnAddPrim(Pack, this); + if (OnAddPrim != null) + { + OnAddPrim(Pack, this); + } break; case PacketType.ObjectShape: ObjectShapePacket shape = (ObjectShapePacket)Pack; for (int i = 0; i < shape.ObjectData.Length; i++) { - OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]); + if (OnUpdatePrimShape != null) + { + OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]); + } } break; case PacketType.ObjectSelect: ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack; for (int i = 0; i < incomingselect.ObjectData.Length; i++) { - OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this); + if (OnObjectSelect != null) + { + OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this); + } } break; case PacketType.ObjectFlagUpdate: ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack; - OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this); + if (OnUpdatePrimFlags != null) + { + OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this); + } break; case PacketType.ObjectImage: ObjectImagePacket imagePack = (ObjectImagePacket)Pack; for (int i = 0; i < imagePack.ObjectData.Length; i++) { - OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this); - + if (OnUpdatePrimTexture != null) + { + OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this); + } } break; #endregion diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs index 6963a0bbbf..d7e681f7bd 100644 --- a/OpenSim/OpenSim.RegionServer/ClientView.cs +++ b/OpenSim/OpenSim.RegionServer/ClientView.cs @@ -80,9 +80,9 @@ namespace OpenSim protected AuthenticateSessionsBase m_authenticateSessionsHandler; - public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions) + public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions) { - + m_world = world; m_clientThreads = clientThreads; m_assetCache = assetCache; @@ -229,8 +229,8 @@ namespace OpenSim protected virtual void InitNewClient() { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); - OnNewAvatar(this, this.AgentID, this.m_child); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); + this.m_world.AddNewAvatar(this, this.AgentID, false); } protected virtual void AuthUser() diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs index dd8de4c610..d40de47333 100644 --- a/OpenSim/OpenSim.RegionServer/PacketServer.cs +++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs @@ -65,7 +65,7 @@ namespace OpenSim public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass) { - ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, assetCache, this, inventoryCache, authenticateSessionsClass); + ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass); this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser); diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs index 5b66fce30c..bbc3a58987 100644 --- a/OpenSim/OpenSim.World/Avatar.cs +++ b/OpenSim/OpenSim.World/Avatar.cs @@ -41,19 +41,21 @@ namespace OpenSim.world public Avatar(IClientAPI TheClient, World world, Dictionary clientThreads, RegionInfo regionDat) { + Console.WriteLine("avatar point 1"); m_world = world; // m_clientThreads = clientThreads; m_regionName = regionData.RegionName; m_regionHandle = regionData.RegionHandle; m_regionTerraform = regionData.RegionTerraform; m_regionWaterHeight = regionData.RegionWaterHeight; - + Console.WriteLine("avatar point 2"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)"); ControllingClient = TheClient; this.firstname = ControllingClient.FirstName; this.lastname = ControllingClient.LastName; localid = 8880000 + (this.m_world._localNumber++); Pos = ControllingClient.StartPos; + Console.WriteLine("avatar point 3"); visualParams = new byte[218]; for (int i = 0; i < 218; i++) { @@ -68,7 +70,7 @@ namespace OpenSim.world this.Wearables[0].ItemID = LLUUID.Random(); this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); - + Console.WriteLine("avatar point 4"); //register for events ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance); diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs index 22a5799380..db17db2304 100644 --- a/OpenSim/OpenSim/OpenSimMain.cs +++ b/OpenSim/OpenSim/OpenSimMain.cs @@ -121,7 +121,7 @@ namespace OpenSim if (m_sandbox) { - loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, this.user_accounts); + loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false); loginServer.Startup(); loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession);