aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
diff options
context:
space:
mode:
authorMelanie2010-08-23 23:55:15 +0100
committerMelanie2010-08-23 23:55:15 +0100
commit1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a (patch)
treecdb5556f5e7cbd3c846f2ed4e65479e48a5cc44f /OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentAdd system lookup folder fix to the RemoveXInventoryServiceConnector as well ... (diff)
downloadopensim-SC_OLD-1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a.zip
opensim-SC_OLD-1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a.tar.gz
opensim-SC_OLD-1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a.tar.bz2
opensim-SC_OLD-1bfec00a88a11a13d62a32c0549bbf6e8aa1e69a.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 1603c07..fc1afaf 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -223,4 +223,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
223 OnInstantMessage(null, msg); 223 OnInstantMessage(null, msg);
224 } 224 }
225 } 225 }
226} 226} \ No newline at end of file