aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2012-10-07 02:48:28 +0100
committerMelanie2012-10-07 02:48:28 +0100
commitf7df68d922758c0a78664abe82d631579f6aa63f (patch)
tree85daa41ff4b35653b4fbb987cbc852ad853decef /OpenSim/Region/OptionalModules/World
parentMerge branch 'master' into careminster (diff)
parentrefactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is... (diff)
downloadopensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.zip
opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.gz
opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.bz2
opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index bb3748e..66fc216 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
148 OnInstantMessage(this, new GridInstantMessage(m_scene, 148 OnInstantMessage(this, new GridInstantMessage(m_scene,
149 m_uuid, m_firstname + " " + m_lastname, 149 m_uuid, m_firstname + " " + m_lastname,
150 target, 0, false, message, 150 target, 0, false, message,
151 UUID.Zero, false, Position, new byte[0])); 151 UUID.Zero, false, Position, new byte[0], true));
152 } 152 }
153 153
154 public void SendAgentOffline(UUID[] agentIDs) 154 public void SendAgentOffline(UUID[] agentIDs)