aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-07-13 21:12:16 +0000
committerMW2007-07-13 21:12:16 +0000
commit9b61def98dfa6a0b4f618cafdc84632774a77738 (patch)
tree862c4ec7b3f395901dd11da288cbe9478287a52a
parent* Added sample event to ScriptInterpretedEvents (diff)
downloadopensim-SC-9b61def98dfa6a0b4f618cafdc84632774a77738.zip
opensim-SC-9b61def98dfa6a0b4f618cafdc84632774a77738.tar.gz
opensim-SC-9b61def98dfa6a0b4f618cafdc84632774a77738.tar.bz2
opensim-SC-9b61def98dfa6a0b4f618cafdc84632774a77738.tar.xz
Chat/Shout/etc should be working again
-rw-r--r--OpenSim/Region/Environment/ParcelManager.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
3 files changed, 9 insertions, 3 deletions
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
475 fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256)); 475 fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
476 fullSimParcel.parcelData.parcelName = "Your Sim Parcel"; 476 fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
477 fullSimParcel.parcelData.parcelDesc = ""; 477 fullSimParcel.parcelData.parcelDesc = "";
478
479 fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID; 478 fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
480 fullSimParcel.parcelData.salePrice = 1; 479 fullSimParcel.parcelData.salePrice = 1;
481 fullSimParcel.parcelData.parcelFlags |= (uint)libsecondlife.Parcel.ParcelFlags.ForSale; 480
481 fullSimParcel.parcelData.parcelFlags |=(uint)libsecondlife.Parcel.ParcelFlags.ForSale;
482 fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased; 482 fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
483 483
484 addParcel(fullSimParcel); 484 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
141 { 141 {
142 // Console.WriteLine("Chat message"); 142 // Console.WriteLine("Chat message");
143 ScenePresence avatar = null; 143 ScenePresence avatar = null;
144 if (this.Avatars.ContainsKey(fromAgentID))
145 {
146 avatar = this.Avatars[fromAgentID];
147 fromPos = avatar.Pos;
148 fromName = avatar.firstname + " " + avatar.lastname;
149 }
144 150
145 m_clientManager.ForEachClient(delegate(IClientAPI client) 151 m_clientManager.ForEachClient(delegate(IClientAPI client)
146 { 152 {
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
478 client.OnObjectName += this.PrimName; 478 client.OnObjectName += this.PrimName;
479 client.OnLinkObjects += this.LinkObjects; 479 client.OnLinkObjects += this.LinkObjects;
480 client.OnObjectDuplicate += this.DuplicateObject; 480 client.OnObjectDuplicate += this.DuplicateObject;
481 481
482 client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); 482 client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
483 client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); 483 client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
484 client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); 484 client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);