aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDr Scofield2008-05-26 15:37:31 +0000
committerDr Scofield2008-05-26 15:37:31 +0000
commit1bb1d5d9b06887380eec0696102eb859f04810e6 (patch)
treefecd69763a3daeba464a1bcbc1349828dd9445b3 /OpenSim/Framework
parentAdding OnChatBroadcast event logic to EventManager providing (diff)
downloadopensim-SC_OLD-1bb1d5d9b06887380eec0696102eb859f04810e6.zip
opensim-SC_OLD-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.gz
opensim-SC_OLD-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.bz2
opensim-SC_OLD-1bb1d5d9b06887380eec0696102eb859f04810e6.tar.xz
This cleans up a merge mess from the earlier checkin and implements llOwnerSay()
via the newly created Scene.SimBroadcast() call.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 0823b0d..7fb8091 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -85,6 +85,7 @@ namespace OpenSim.Framework
85 85
86 protected IScene m_scene; 86 protected IScene m_scene;
87 protected IClientAPI m_sender; 87 protected IClientAPI m_sender;
88 protected object m_senderObject;
88 protected ChatTypeEnum m_type; 89 protected ChatTypeEnum m_type;
89 protected LLUUID m_fromID; 90 protected LLUUID m_fromID;
90 91
@@ -140,6 +141,9 @@ namespace OpenSim.Framework
140 141
141 #region IEventArgs Members 142 #region IEventArgs Members
142 143
144 /// TODO: Sender and SenderObject should just be Sender and of
145 /// type IChatSender
146
143 /// <summary> 147 /// <summary>
144 /// The client responsible for sending the message, or null. 148 /// The client responsible for sending the message, or null.
145 /// </summary> 149 /// </summary>
@@ -149,6 +153,15 @@ namespace OpenSim.Framework
149 set { m_sender = value; } 153 set { m_sender = value; }
150 } 154 }
151 155
156 /// <summary>
157 /// The object responsible for sending the message, or null.
158 /// </summary>
159 public object SenderObject
160 {
161 get { return m_senderObject; }
162 set { m_senderObject = value; }
163 }
164
152 public LLUUID SenderUUID 165 public LLUUID SenderUUID
153 { 166 {
154 get { return m_fromID; } 167 get { return m_fromID; }