diff options
| author | Melanie | 2012-10-26 21:13:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-26 21:13:01 +0100 |
| commit | 26cc57b6cafda5168baab49cabe34d96f01dbd6d (patch) | |
| tree | 94e078a75ab68825e64b15498f67d82988858dc9 /OpenSim/Region/OptionalModules/Avatar | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Make the error thrown logged when a simulator in grid mode is trying t... (diff) | |
| download | opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.zip opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.gz opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.bz2 opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index e22618d..5c3be29 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
| @@ -546,8 +546,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
| 546 | c.SenderUUID = UUID.Zero; | 546 | c.SenderUUID = UUID.Zero; |
| 547 | c.Scene = agent.Scene; | 547 | c.Scene = agent.Scene; |
| 548 | 548 | ||
| 549 | agent.ControllingClient.SendChatMessage(msg, (byte) ChatTypeEnum.Say, PosOfGod, m_whoami, UUID.Zero, | 549 | agent.ControllingClient.SendChatMessage( |
| 550 | (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); | 550 | msg, (byte) ChatTypeEnum.Say, PosOfGod, m_whoami, UUID.Zero, UUID.Zero, |
| 551 | (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); | ||
| 551 | } | 552 | } |
| 552 | 553 | ||
| 553 | private static void checkStringParameters(XmlRpcRequest request, string[] param) | 554 | private static void checkStringParameters(XmlRpcRequest request, string[] param) |