aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorMW2007-07-13 21:12:16 +0000
committerMW2007-07-13 21:12:16 +0000
commit9b61def98dfa6a0b4f618cafdc84632774a77738 (patch)
tree862c4ec7b3f395901dd11da288cbe9478287a52a /OpenSim/Region/Environment/Scenes
parent* Added sample event to ScriptInterpretedEvents (diff)
downloadopensim-SC_OLD-9b61def98dfa6a0b4f618cafdc84632774a77738.zip
opensim-SC_OLD-9b61def98dfa6a0b4f618cafdc84632774a77738.tar.gz
opensim-SC_OLD-9b61def98dfa6a0b4f618cafdc84632774a77738.tar.bz2
opensim-SC_OLD-9b61def98dfa6a0b4f618cafdc84632774a77738.tar.xz
Chat/Shout/etc should be working again
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
2 files changed, 7 insertions, 1 deletions
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);