diff options
author | Melanie Thielker | 2009-05-02 17:31:49 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-02 17:31:49 +0000 |
commit | 66e25abbfed3c641f1114d2d0525831eeb566f89 (patch) | |
tree | 1f1b045e4ef266436b27cdcd6573f5d4f7ca7e6c /OpenSim | |
parent | Thank you kindly, Fly-Man, for a patch that: (diff) | |
download | opensim-SC-66e25abbfed3c641f1114d2d0525831eeb566f89.zip opensim-SC-66e25abbfed3c641f1114d2d0525831eeb566f89.tar.gz opensim-SC-66e25abbfed3c641f1114d2d0525831eeb566f89.tar.bz2 opensim-SC-66e25abbfed3c641f1114d2d0525831eeb566f89.tar.xz |
Plumb conifg into the client views. Add config option to configure packet
dropping.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IScene.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 6 |
4 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index 6aebf03..629aeaa 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenSim.Framework.Console; | 29 | using OpenSim.Framework.Console; |
30 | using Nini.Config; | ||
30 | 31 | ||
31 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
32 | { | 33 | { |
@@ -62,6 +63,8 @@ namespace OpenSim.Framework | |||
62 | RegionStatus RegionStatus { get; set; } | 63 | RegionStatus RegionStatus { get; set; } |
63 | 64 | ||
64 | ClientManager ClientManager { get; } | 65 | ClientManager ClientManager { get; } |
66 | IConfigSource Config { get; } | ||
67 | |||
65 | float TimeDilation { get; } | 68 | float TimeDilation { get; } |
66 | 69 | ||
67 | event restart OnRestart; | 70 | event restart OnRestart; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 4bc568c..1668bd3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -44,6 +44,7 @@ using OpenSim.Framework.Statistics; | |||
44 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Region.Framework.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
46 | using Timer=System.Timers.Timer; | 46 | using Timer=System.Timers.Timer; |
47 | using Nini.Config; | ||
47 | 48 | ||
48 | namespace OpenSim.Region.ClientStack.LindenUDP | 49 | namespace OpenSim.Region.ClientStack.LindenUDP |
49 | { | 50 | { |
@@ -517,6 +518,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
517 | m_PacketHandler.SynchronizeClient = SynchronizeClient; | 518 | m_PacketHandler.SynchronizeClient = SynchronizeClient; |
518 | m_PacketHandler.OnPacketStats += PopulateStats; | 519 | m_PacketHandler.OnPacketStats += PopulateStats; |
519 | 520 | ||
521 | if (scene.Config != null) | ||
522 | { | ||
523 | IConfig clientConfig = scene.Config.Configs["LLClient"]; | ||
524 | if (clientConfig != null) | ||
525 | { | ||
526 | m_PacketHandler.ReliableIsImportant = | ||
527 | clientConfig.GetBoolean("ReliableIsImportant", | ||
528 | false); | ||
529 | } | ||
530 | } | ||
531 | |||
520 | RegisterLocalPacketHandlers(); | 532 | RegisterLocalPacketHandlers(); |
521 | m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<IJ2KDecoder>()); | 533 | m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<IJ2KDecoder>()); |
522 | } | 534 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7872a6e..5270d11 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -135,6 +135,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
135 | { | 135 | { |
136 | get { return m_capsModule; } | 136 | get { return m_capsModule; } |
137 | } | 137 | } |
138 | |||
139 | public IConfigSource Config | ||
140 | { | ||
141 | get { return m_config; } | ||
142 | } | ||
138 | 143 | ||
139 | // Central Update Loop | 144 | // Central Update Loop |
140 | 145 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 6ab7e7a..c317c2a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -31,6 +31,7 @@ using System.Reflection; | |||
31 | using System.Threading; | 31 | using System.Threading; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using Nini.Config; | ||
34 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
@@ -50,6 +51,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
50 | 51 | ||
51 | #region Fields | 52 | #region Fields |
52 | 53 | ||
54 | public IConfigSource Config | ||
55 | { | ||
56 | get { return null; } | ||
57 | } | ||
58 | |||
53 | /// <value> | 59 | /// <value> |
54 | /// All the region modules attached to this scene. | 60 | /// All the region modules attached to this scene. |
55 | /// </value> | 61 | /// </value> |