aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-09-27 01:32:06 +0100
committerMelanie2010-09-27 01:32:06 +0100
commit296cf04ce636bd1e52eac35221e7ed6173bbcc6f (patch)
treeaf731ae0d415d108ea4466a2fc0c74ade3f7a85a /OpenSim/Region
parentRestrict inventory items added in a transaction to folder belonging (diff)
parentQuash the region ID on intersim messages. That prevents people from determining (diff)
downloadopensim-SC_OLD-296cf04ce636bd1e52eac35221e7ed6173bbcc6f.zip
opensim-SC_OLD-296cf04ce636bd1e52eac35221e7ed6173bbcc6f.tar.gz
opensim-SC_OLD-296cf04ce636bd1e52eac35221e7ed6173bbcc6f.tar.bz2
opensim-SC_OLD-296cf04ce636bd1e52eac35221e7ed6173bbcc6f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 2a405ac..d8e0f96 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
373 gim.fromAgentName = fromAgentName; 373 gim.fromAgentName = fromAgentName;
374 gim.fromGroup = fromGroup; 374 gim.fromGroup = fromGroup;
375 gim.imSessionID = imSessionID.Guid; 375 gim.imSessionID = imSessionID.Guid;
376 gim.RegionID = RegionID.Guid; 376 gim.RegionID = UUID.Zero.Guid; // RegionID.Guid;
377 gim.timestamp = timestamp; 377 gim.timestamp = timestamp;
378 gim.toAgentID = toAgentID.Guid; 378 gim.toAgentID = toAgentID.Guid;
379 gim.message = message; 379 gim.message = message;