aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Chat
diff options
context:
space:
mode:
authorTom2010-08-03 19:55:57 -0700
committerTom2010-08-03 19:55:57 -0700
commit6076eb5558864562085c01aa62288d14e411a41a (patch)
tree778b43a4221cbfb31c29959e76cf27ca14ca782d /OpenSim/Region/CoreModules/Avatar/Chat
parentScripted sit target fixes (diff)
parentClean up some messiness in IM sending. Having offline IM enabled now no longer (diff)
downloadopensim-SC_OLD-6076eb5558864562085c01aa62288d14e411a41a.zip
opensim-SC_OLD-6076eb5558864562085c01aa62288d14e411a41a.tar.gz
opensim-SC_OLD-6076eb5558864562085c01aa62288d14e411a41a.tar.bz2
opensim-SC_OLD-6076eb5558864562085c01aa62288d14e411a41a.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')
-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 }