From 9b61def98dfa6a0b4f618cafdc84632774a77738 Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 13 Jul 2007 21:12:16 +0000
Subject: Chat/Shout/etc  should be working again

---
 OpenSim/Region/Environment/ParcelManager.cs               | 4 ++--
 OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 6 ++++++
 OpenSim/Region/Environment/Scenes/Scene.cs                | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 1e55633..ef6603d 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -475,10 +475,10 @@ namespace OpenSim.Region.Environment
             fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
             fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
             fullSimParcel.parcelData.parcelDesc = "";
-
             fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
             fullSimParcel.parcelData.salePrice = 1;
-            fullSimParcel.parcelData.parcelFlags |= (uint)libsecondlife.Parcel.ParcelFlags.ForSale;
+
+            fullSimParcel.parcelData.parcelFlags |=(uint)libsecondlife.Parcel.ParcelFlags.ForSale;
             fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
 
             addParcel(fullSimParcel);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index b86e5c8..f9b3145 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -141,6 +141,12 @@ namespace OpenSim.Region.Environment.Scenes
         {
             // Console.WriteLine("Chat message");
             ScenePresence avatar = null;
+            if (this.Avatars.ContainsKey(fromAgentID))
+            {
+                avatar = this.Avatars[fromAgentID];
+                fromPos = avatar.Pos;
+                fromName = avatar.firstname + " " + avatar.lastname;
+            }
 
             m_clientManager.ForEachClient(delegate(IClientAPI client)
                                               {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bd3d931..a1b060f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnObjectName += this.PrimName;
             client.OnLinkObjects += this.LinkObjects;
             client.OnObjectDuplicate += this.DuplicateObject;
-
+            
             client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
             client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
             client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
-- 
cgit v1.1