diff options
| author | teravus | 2012-11-15 10:05:16 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 10:05:16 -0500 |
| commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
| tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Region/OptionalModules/Avatar/Concierge | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz | |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Concierge')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index 5c3be29..e22618d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
| @@ -546,9 +546,8 @@ 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( | 549 | agent.ControllingClient.SendChatMessage(msg, (byte) ChatTypeEnum.Say, PosOfGod, m_whoami, UUID.Zero, |
| 550 | msg, (byte) ChatTypeEnum.Say, PosOfGod, m_whoami, UUID.Zero, UUID.Zero, | 550 | (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); |
| 551 | (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); | ||
| 552 | } | 551 | } |
| 553 | 552 | ||
| 554 | private static void checkStringParameters(XmlRpcRequest request, string[] param) | 553 | private static void checkStringParameters(XmlRpcRequest request, string[] param) |