aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorDr Scofield2009-02-06 16:55:34 +0000
committerDr Scofield2009-02-06 16:55:34 +0000
commit9b66108081a8c8cf79faaa6c541554091c40850e (patch)
tree095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/Region/ClientStack
parent* removed superfluous constants class (diff)
downloadopensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2
opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz
This changeset is the step 1 of 2 in refactoring
OpenSim.Region.Environment into a "framework" part and a modules only part. This first changeset refactors OpenSim.Region.Environment.Scenes, OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region modules in OpenSim.Region.Environment. The next step will be to move region modules up from OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and then sort out which modules are really core modules and which should move out to forge. I've been very careful to NOT BREAK anything. i hope i've succeeded. as this is the work of a whole week i hope i managed to keep track with the applied patches of the last week --- could any of you that did check in stuff have a look at whether it survived? thx!
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/IClientNetworkServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs27
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs2
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs3
7 files changed, 16 insertions, 26 deletions
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index 2d0630b..0073389 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -29,7 +29,7 @@ using System.Net;
29using System.Net.Sockets; 29using System.Net.Sockets;
30using Nini.Config; 30using Nini.Config;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34 34
35namespace OpenSim.Region.ClientStack 35namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 42dbbee..59df3f1 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -41,9 +41,8 @@ using OpenSim.Framework;
41using OpenSim.Framework.Client; 41using OpenSim.Framework.Client;
42using OpenSim.Framework.Communications.Cache; 42using OpenSim.Framework.Communications.Cache;
43using OpenSim.Framework.Statistics; 43using OpenSim.Framework.Statistics;
44using OpenSim.Region.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Environment.Interfaces; 45using OpenSim.Region.Framework.Scenes;
46using OpenSim.Region.Environment.Scenes;
47using Timer = System.Timers.Timer; 46using Timer = System.Timers.Timer;
48 47
49namespace OpenSim.Region.ClientStack.LindenUDP 48namespace OpenSim.Region.ClientStack.LindenUDP
@@ -475,7 +474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
475 m_PacketHandler.OnPacketStats += PopulateStats; 474 m_PacketHandler.OnPacketStats += PopulateStats;
476 475
477 RegisterLocalPacketHandlers(); 476 RegisterLocalPacketHandlers();
478 m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Environment.Interfaces.IJ2KDecoder>()); 477 m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Framework.Interfaces.IJ2KDecoder>());
479 } 478 }
480 479
481 public void SetDebugPacketLevel(int newDebugPacketLevel) 480 public void SetDebugPacketLevel(int newDebugPacketLevel)
@@ -1214,20 +1213,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1214 { 1213 {
1215 dialog = 17; 1214 dialog = 17;
1216 1215
1217 OSD Item = Environment.EventQueueHelper.ChatterboxInvitation( 1216 eq.ChatterboxInvitation(
1218 new UUID("00000000-68f9-1111-024e-222222111123"), 1217 new UUID("00000000-68f9-1111-024e-222222111123"),
1219 "OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0, 1218 "OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0,
1220 false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); 1219 false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket);
1221 1220
1222 eq.Enqueue(Item, toAgent); 1221 eq.ChatterBoxSessionAgentListUpdates(
1223 m_log.Info("########### eq ChatterboxInvitation #############\n" + Item);
1224
1225 Item = Environment.EventQueueHelper.ChatterBoxSessionAgentListUpdates(
1226 new UUID("00000000-68f9-1111-024e-222222111123"), 1222 new UUID("00000000-68f9-1111-024e-222222111123"),
1227 fromAgent, false, false, false); 1223 fromAgent, toAgent, false, false, false);
1228
1229 eq.Enqueue(Item, toAgent);
1230 m_log.Info("########### eq ChatterBoxSessionAgentListUpdates #############\n" + Item);
1231 } 1224 }
1232 1225
1233 System.Console.WriteLine("SendInstantMessage: " + msg); 1226 System.Console.WriteLine("SendInstantMessage: " + msg);
@@ -3193,9 +3186,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3193 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); 3186 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
3194 if (eq != null) 3187 if (eq != null)
3195 { 3188 {
3196 OSD Item = Environment.EventQueueHelper.ParcelProperties(updatePacket); 3189 eq.ParcelProperties(updatePacket, this.AgentId);
3197
3198 eq.Enqueue(Item, this.AgentId);
3199 } 3190 }
3200 } 3191 }
3201 catch (Exception ex) 3192 catch (Exception ex)
@@ -7608,9 +7599,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7608 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); 7599 IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>();
7609 if (eq != null) 7600 if (eq != null)
7610 { 7601 {
7611 OSD Item = Environment.EventQueueHelper.GroupMembership(Groupupdate); 7602 eq.GroupMembership(Groupupdate, this.AgentId);
7612
7613 eq.Enqueue(Item, this.AgentId);
7614 } 7603 }
7615 } 7604 }
7616 catch (Exception ex) 7605 catch (Exception ex)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
index d2d86b9..b801f7a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
@@ -35,8 +35,8 @@ using OpenSim.Framework;
35using OpenSim.Framework.Client; 35using OpenSim.Framework.Client;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Statistics; 37using OpenSim.Framework.Statistics;
38using OpenSim.Region.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Region.ClientStack.LindenUDP 41namespace OpenSim.Region.ClientStack.LindenUDP
42{ 42{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index f903c45..9b71770 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using C5; 33using C5;
34using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
35using OpenMetaverse.Imaging; 35using OpenMetaverse.Imaging;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 1615767..f53d485 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -36,7 +36,7 @@ using log4net;
36using Nini.Config; 36using Nini.Config;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Region.ClientStack.LindenUDP 41namespace OpenSim.Region.ClientStack.LindenUDP
42{ 42{
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
index 6880973..90d7d63 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
@@ -29,7 +29,7 @@ using System.Xml;
29using Nini.Config; 29using Nini.Config;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Environment.Scenes; 32using OpenSim.Region.Framework.Scenes;
33 33
34namespace OpenSim.Region.ClientStack.LindenUDP.Tests 34namespace OpenSim.Region.ClientStack.LindenUDP.Tests
35{ 35{
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index cc3edff..0921dbd 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -36,8 +36,9 @@ using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Region.Framework;
40using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Environment; 41using OpenSim.Region.Environment;
40using OpenSim.Region.Environment.Scenes;
41using OpenSim.Region.Physics.Manager; 42using OpenSim.Region.Physics.Manager;
42 43
43namespace OpenSim.Region.ClientStack 44namespace OpenSim.Region.ClientStack