aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDr Scofield2008-07-25 10:05:50 +0000
committerDr Scofield2008-07-25 10:05:50 +0000
commit24e15088ea796afec01a197c6812c1c52e2de324 (patch)
tree0ecc8cc29d5c0d0297c2f5bc5c36f0d097e07f9d /OpenSim/Framework
parentFrom: awebb (diff)
downloadopensim-SC_OLD-24e15088ea796afec01a197c6812c1c52e2de324.zip
opensim-SC_OLD-24e15088ea796afec01a197c6812c1c52e2de324.tar.gz
opensim-SC_OLD-24e15088ea796afec01a197c6812c1c52e2de324.tar.bz2
opensim-SC_OLD-24e15088ea796afec01a197c6812c1c52e2de324.tar.xz
renaming the increasingly ill-named ChatFromViewerArgs to OSChatMessage
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChatFromViewerArgs.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/ChatFromViewerArgs.cs b/OpenSim/Framework/ChatFromViewerArgs.cs
index fb4bb94..15113ed 100644
--- a/OpenSim/Framework/ChatFromViewerArgs.cs
+++ b/OpenSim/Framework/ChatFromViewerArgs.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Framework
12 /// <summary> 12 /// <summary>
13 /// ChatFromViewer Arguments 13 /// ChatFromViewer Arguments
14 /// </summary> 14 /// </summary>
15 public class ChatFromViewerArgs : EventArgs, IEventArgs 15 public class OSChatMessage : EventArgs, IEventArgs
16 { 16 {
17 protected int m_channel; 17 protected int m_channel;
18 protected string m_from; 18 protected string m_from;
@@ -25,7 +25,7 @@ namespace OpenSim.Framework
25 protected ChatTypeEnum m_type; 25 protected ChatTypeEnum m_type;
26 protected LLUUID m_fromID; 26 protected LLUUID m_fromID;
27 27
28 public ChatFromViewerArgs() 28 public OSChatMessage()
29 { 29 {
30 m_position = new LLVector3(); 30 m_position = new LLVector3();
31 } 31 }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 742b211..d659a1f 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 37
38 public delegate void ViewerEffectEventHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args); 38 public delegate void ViewerEffectEventHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args);
39 39
40 public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e); 40 public delegate void ChatMessage(Object sender, OSChatMessage e);
41 41
42 public delegate void TextureRequest(Object sender, TextureRequestArgs e); 42 public delegate void TextureRequest(Object sender, TextureRequestArgs e);
43 43
@@ -347,7 +347,7 @@ namespace OpenSim.Framework
347 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] 347 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")]
348 event ImprovedInstantMessage OnInstantMessage; 348 event ImprovedInstantMessage OnInstantMessage;
349 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments. Rename OnChat.")] 349 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments. Rename OnChat.")]
350 event ChatFromViewer OnChatFromViewer; 350 event ChatMessage OnChatFromViewer;
351 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] 351 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")]
352 event TextureRequest OnRequestTexture; 352 event TextureRequest OnRequestTexture;
353 // [Obsolete("LLClientView Specific - Remove bitbuckets. Adam, can you be more specific here.. as I don't see any bit buckets.")] 353 // [Obsolete("LLClientView Specific - Remove bitbuckets. Adam, can you be more specific here.. as I don't see any bit buckets.")]