From 54ef77f0fda5fabc6f4677e145fafb74d225a77e Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 1 Jul 2007 18:33:44 +0000
Subject: Can change the name and description of a prim.

---
 OpenSim/Region/ClientStack/ClientView.API.cs       |  2 ++
 .../ClientStack/ClientView.ProcessPackets.cs       | 29 +++++++++++++++++++---
 OpenSim/Region/ClientStack/ClientView.cs           |  1 +
 3 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 5056f41..7a9c6cf 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -58,6 +58,8 @@ namespace OpenSim.Region.ClientStack
         public event GenericCall4 OnAddPrim;
         public event UpdateShape OnUpdatePrimShape;
         public event ObjectSelect OnObjectSelect;
+        public event GenericCall7 OnObjectDescription;
+        public event GenericCall7 OnObjectName;
         public event UpdatePrimFlags OnUpdatePrimFlags;
         public event UpdatePrimTexture OnUpdatePrimTexture;
         public event UpdateVector OnUpdatePrimPosition;
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 0d90968..75d3f65 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.ClientStack
                         {
                             if (OnModifyTerrain != null)
                             {
-                                OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, modify.ModifyBlock.BrushSize, 
+                                OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, modify.ModifyBlock.BrushSize,
                                     modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
                             }
                         }
@@ -167,8 +167,8 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.AgentUpdate:
                         if (OnAgentUpdate != null)
                         {
-                            AgentUpdatePacket agenUpdate = (AgentUpdatePacket) Pack;
-                            OnAgentUpdate(this, agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotation );
+                            AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack;
+                            OnAgentUpdate(this, agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotation);
                         }
                         break;
                     case PacketType.AgentAnimation:
@@ -274,6 +274,29 @@ namespace OpenSim.Region.ClientStack
                             OnDeGrapObject(deGrap.ObjectData.LocalID, this);
                         }
                         break;
+                    case PacketType.ObjectDescription:
+                        ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack;
+                        for (int i = 0; i < objDes.ObjectData.Length; i++)
+                        {
+                            if (OnObjectDescription != null)
+                            {
+                                OnObjectDescription(objDes.ObjectData[i].LocalID, enc.GetString(objDes.ObjectData[i].Description));
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectName:
+                        ObjectNamePacket objName = (ObjectNamePacket)Pack;
+                        for (int i = 0; i < objName.ObjectData.Length; i++)
+                        {
+                            if (OnObjectName != null)
+                            {
+                                OnObjectName(objName.ObjectData[i].LocalID, enc.GetString(objName.ObjectData[i].Name));
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectPermissions:
+                        //Console.WriteLine("permissions set " + Pack.ToString());
+                        break;
                     #endregion
 
                     #region Inventory/Asset/Other related packets
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 402a3ca..a36eeb0 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Region.ClientStack
         private int cachedtextureserial = 0;
         private RegionInfo m_regionData;
         protected AuthenticateSessionsBase m_authenticateSessionsHandler;
+        private System.Text.Encoding enc = System.Text.Encoding.ASCII;
 
         public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
         {
-- 
cgit v1.1