diff options
author | Adam Frisby | 2009-04-03 10:40:14 +0000 |
---|---|---|
committer | Adam Frisby | 2009-04-03 10:40:14 +0000 |
commit | 254d3099f03dde79a4e689bcb99e4d67d91f6300 (patch) | |
tree | 5db728a743a7cf7d9194a9438f738103d17faacf /OpenSim | |
parent | * MRM Scripts will now no longer disconnect the client if there was an error ... (diff) | |
download | opensim-SC_OLD-254d3099f03dde79a4e689bcb99e4d67d91f6300.zip opensim-SC_OLD-254d3099f03dde79a4e689bcb99e4d67d91f6300.tar.gz opensim-SC_OLD-254d3099f03dde79a4e689bcb99e4d67d91f6300.tar.bz2 opensim-SC_OLD-254d3099f03dde79a4e689bcb99e4d67d91f6300.tar.xz |
* Implements Scene.SimChat(string,...) rather than byte[]. We should probably mark byte[] as obsolete.
* Implements SOPObject.Say for MRM. (Note, not IObject yet)
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | 11 |
2 files changed, 21 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index df6672d..4c99873 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -84,6 +84,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
84 | SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, false); | 84 | SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, false); |
85 | } | 85 | } |
86 | 86 | ||
87 | public void SimChat(string message, ChatTypeEnum type, Vector3 fromPos, string fromName, UUID fromID, bool fromAgent) | ||
88 | { | ||
89 | SimChat(Utils.StringToBytes(message), type, 0, fromPos, fromName, fromID, fromAgent); | ||
90 | } | ||
91 | |||
92 | public void SimChat(string message, string fromName) | ||
93 | { | ||
94 | SimChat(message, ChatTypeEnum.Broadcast, Vector3.Zero, fromName, UUID.Zero, false); | ||
95 | } | ||
96 | |||
87 | /// <summary> | 97 | /// <summary> |
88 | /// | 98 | /// |
89 | /// </summary> | 99 | /// </summary> |
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index 5010a34..12d996a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs | |||
@@ -215,6 +215,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
215 | set { throw new System.NotImplementedException(); } | 215 | set { throw new System.NotImplementedException(); } |
216 | } | 216 | } |
217 | 217 | ||
218 | #region Public Functions | ||
219 | |||
220 | public void Say(string msg) | ||
221 | { | ||
222 | SceneObjectPart sop = GetSOP(); | ||
223 | |||
224 | m_rootScene.SimChat(msg, ChatTypeEnum.Say, sop.AbsolutePosition, sop.Name, sop.UUID, false); | ||
225 | } | ||
226 | |||
227 | #endregion | ||
228 | |||
218 | 229 | ||
219 | #region Supporting Functions | 230 | #region Supporting Functions |
220 | 231 | ||