aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
diff options
context:
space:
mode:
authorKitto Flora2010-08-04 21:08:14 +0000
committerKitto Flora2010-08-04 21:08:14 +0000
commit0871d20adbe1800655b8a7e9d16f71090bbf5c87 (patch)
tree83a3e62f4aad08af9d98f7de880f2942b45c498c /OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
parentFixes fresh hollowed prim collision shape. (diff)
parentSend attachment updates only to the owner if it's a HUD (diff)
downloadopensim-SC-0871d20adbe1800655b8a7e9d16f71090bbf5c87.zip
opensim-SC-0871d20adbe1800655b8a7e9d16f71090bbf5c87.tar.gz
opensim-SC-0871d20adbe1800655b8a7e9d16f71090bbf5c87.tar.bz2
opensim-SC-0871d20adbe1800655b8a7e9d16f71090bbf5c87.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 50d2f9d..06b1b00 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
218 fromPos = avatar.AbsolutePosition; 218 fromPos = avatar.AbsolutePosition;
219 fromName = avatar.Name; 219 fromName = avatar.Name;
220 fromID = c.Sender.AgentId; 220 fromID = c.Sender.AgentId;
221 if (avatar.GodLevel > 200) 221 if (avatar.GodLevel >= 200)
222 { 222 {
223 fromNamePrefix = m_adminPrefix; 223 fromNamePrefix = m_adminPrefix;
224 } 224 }