diff options
| author | BlueWall | 2012-10-09 06:44:14 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-09 06:44:14 -0400 |
| commit | 252af020b05f386f88174cdd28191e0efbeba626 (patch) | |
| tree | f425499b4338fa3a15f51b7621f4d37dec1d5ce7 /OpenSim/Region/OptionalModules | |
| parent | Added parts to manage repositories and plugin management (diff) | |
| parent | Fix build break (diff) | |
| download | opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.zip opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.gz opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.bz2 opensim-SC_OLD-252af020b05f386f88174cdd28191e0efbeba626.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/ServerMain.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
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 a8e4d90..ffd4222 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) |