aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorunknown2010-05-15 02:20:47 -0700
committerunknown2010-05-15 02:20:47 -0700
commit9dbe90801b47b171ea0838fc45ce7a051027efc5 (patch)
tree59fb6ab8c1670022a7ee3c9bed5278d7c712dba0 /OpenSim/Region
parentRefactor scene presence list for lockless iteration. Lock contention will now... (diff)
parentdelete now unused MessageServerInfo (diff)
downloadopensim-SC_OLD-9dbe90801b47b171ea0838fc45ce7a051027efc5.zip
opensim-SC_OLD-9dbe90801b47b171ea0838fc45ce7a051027efc5.tar.gz
opensim-SC_OLD-9dbe90801b47b171ea0838fc45ce7a051027efc5.tar.bz2
opensim-SC_OLD-9dbe90801b47b171ea0838fc45ce7a051027efc5.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs5
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 6dacbba..02f0968 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -264,6 +264,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
264 fromName = avatar.Name; 264 fromName = avatar.Name;
265 sourceType = ChatSourceType.Agent; 265 sourceType = ChatSourceType.Agent;
266 } 266 }
267 else if (c.SenderUUID != UUID.Zero)
268 {
269 fromID = c.SenderUUID;
270 }
267 271
268 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); 272 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
269 273
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 9df6074..a895d6e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -143,10 +143,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
143 } 143 }
144 144
145 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) 145 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
146 { 146 {
147 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
148 try 147 try
149 { 148 {
149 ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
150
150 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0) 151 if ((obj.LandData.Flags & (uint)ParcelFlags.AllowDamage) != 0)
151 { 152 {
152 avatar.Invulnerable = false; 153 avatar.Invulnerable = false;