aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorAdam Frisby2007-10-19 22:02:07 +0000
committerAdam Frisby2007-10-19 22:02:07 +0000
commit1313544ac7761ec7d84c14009fc95d5d7316004d (patch)
tree39a7bd27f07bb96859f5d09436d7e81e99f951a9 /OpenSim/Region/ClientStack
parentenable IRC bridge via runtime configuration (diff)
downloadopensim-SC_OLD-1313544ac7761ec7d84c14009fc95d5d7316004d.zip
opensim-SC_OLD-1313544ac7761ec7d84c14009fc95d5d7316004d.tar.gz
opensim-SC_OLD-1313544ac7761ec7d84c14009fc95d5d7316004d.tar.bz2
opensim-SC_OLD-1313544ac7761ec7d84c14009fc95d5d7316004d.tar.xz
* Major structural change: Begun converting Events to use (caller, args) syntax to conform with .NET guidelines.
* OnChatFromViewer has been converted as an example. * Bug: SimpleApp's NPC client does not implement a Scene property and will likely crash with a NullReferenceException when it attempts to chat.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs12
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs7
2 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index d92127f..05b1118 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -100,7 +100,17 @@ namespace OpenSim.Region.ClientStack
100 100
101 if (OnChatFromViewer != null) 101 if (OnChatFromViewer != null)
102 { 102 {
103 this.OnChatFromViewer(message, type, channel, fromPos, fromName, fromAgentID); 103 ChatFromViewerArgs args = new ChatFromViewerArgs();
104 args.Channel = channel;
105 args.From = fromName;
106 args.Message = Util.FieldToString(message);
107 args.Type = (ChatTypeEnum)type;
108 args.Position = fromPos;
109
110 args.Scene = Scene;
111 args.Sender = this;
112
113 this.OnChatFromViewer(this, args);
104 } 114 }
105 break; 115 break;
106 case PacketType.ImprovedInstantMessage: 116 case PacketType.ImprovedInstantMessage:
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 2489739..cf4072c 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -68,7 +68,14 @@ namespace OpenSim.Region.ClientStack
68 //private AgentAssetUpload UploadAssets; 68 //private AgentAssetUpload UploadAssets;
69 private LLUUID newAssetFolder = LLUUID.Zero; 69 private LLUUID newAssetFolder = LLUUID.Zero;
70 private int debug = 0; 70 private int debug = 0;
71
71 protected IScene m_scene; 72 protected IScene m_scene;
73
74 public IScene Scene
75 {
76 get { return m_scene; }
77 }
78
72 private ClientManager m_clientManager; 79 private ClientManager m_clientManager;
73 private AssetCache m_assetCache; 80 private AssetCache m_assetCache;
74 // private InventoryCache m_inventoryCache; 81 // private InventoryCache m_inventoryCache;