diff options
| author | Melanie | 2012-09-09 16:30:01 +0200 |
|---|---|---|
| committer | Melanie | 2012-09-09 16:30:01 +0200 |
| commit | 0556bbefdda9643abf4bbba08ab8e3f066501b74 (patch) | |
| tree | a02d2e786b1542c5a8597b045941e965a3019f7e /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-0556bbefdda9643abf4bbba08ab8e3f066501b74.zip opensim-SC_OLD-0556bbefdda9643abf4bbba08ab8e3f066501b74.tar.gz opensim-SC_OLD-0556bbefdda9643abf4bbba08ab8e3f066501b74.tar.bz2 opensim-SC_OLD-0556bbefdda9643abf4bbba08ab8e3f066501b74.tar.xz | |
Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM
to UUID.Zero because it ties up XMLRPC handlers needlessly.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 1406aae..0c067d7 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
| @@ -137,6 +137,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 137 | { | 137 | { |
| 138 | UUID toAgentID = new UUID(im.toAgentID); | 138 | UUID toAgentID = new UUID(im.toAgentID); |
| 139 | 139 | ||
| 140 | if (toAgentID == UUID.Zero) | ||
| 141 | return; | ||
| 142 | |||
| 140 | // Try root avatar only first | 143 | // Try root avatar only first |
| 141 | foreach (Scene scene in m_Scenes) | 144 | foreach (Scene scene in m_Scenes) |
| 142 | { | 145 | { |