aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-02 17:31:49 +0000
committerMelanie Thielker2009-05-02 17:31:49 +0000
commit66e25abbfed3c641f1114d2d0525831eeb566f89 (patch)
tree1f1b045e4ef266436b27cdcd6573f5d4f7ca7e6c
parentThank you kindly, Fly-Man, for a patch that: (diff)
downloadopensim-SC_OLD-66e25abbfed3c641f1114d2d0525831eeb566f89.zip
opensim-SC_OLD-66e25abbfed3c641f1114d2d0525831eeb566f89.tar.gz
opensim-SC_OLD-66e25abbfed3c641f1114d2d0525831eeb566f89.tar.bz2
opensim-SC_OLD-66e25abbfed3c641f1114d2d0525831eeb566f89.tar.xz
Plumb conifg into the client views. Add config option to configure packet
dropping.
-rw-r--r--OpenSim/Framework/IScene.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs6
-rw-r--r--bin/OpenSim.ini.example4
-rw-r--r--prebuild.xml1
6 files changed, 31 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
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework.Console; 29using OpenSim.Framework.Console;
30using Nini.Config;
30 31
31namespace OpenSim.Framework 32namespace 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;
44using OpenSim.Region.Framework.Interfaces; 44using OpenSim.Region.Framework.Interfaces;
45using OpenSim.Region.Framework.Scenes; 45using OpenSim.Region.Framework.Scenes;
46using Timer=System.Timers.Timer; 46using Timer=System.Timers.Timer;
47using Nini.Config;
47 48
48namespace OpenSim.Region.ClientStack.LindenUDP 49namespace 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;
31using System.Threading; 31using System.Threading;
32using OpenMetaverse; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Nini.Config;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
36using OpenSim.Framework.Communications.Cache; 37using 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>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c210a9b..f11310a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1275,3 +1275,7 @@
1275 ; Enables the experimental packet pool. Yes, we've been here before. 1275 ; Enables the experimental packet pool. Yes, we've been here before.
1276 ;RecyclePackets = true; 1276 ;RecyclePackets = true;
1277 ;RecycleDataBlocks = true; 1277 ;RecycleDataBlocks = true;
1278
1279[LLClient]
1280 ; Resend packets markes as reliable until they are received
1281 ;ReliableIsImportant = false
diff --git a/prebuild.xml b/prebuild.xml
index 76ea4ff..2f0b27b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1390,6 +1390,7 @@
1390 <Reference name="Nini.dll" /> 1390 <Reference name="Nini.dll" />
1391 <Reference name="log4net.dll"/> 1391 <Reference name="log4net.dll"/>
1392 <Reference name="C5.dll" /> 1392 <Reference name="C5.dll" />
1393 <Reference name="Nini.dll" />
1393 1394
1394 <Files> 1395 <Files>
1395 <Match pattern="*.cs" recurse="false"/> 1396 <Match pattern="*.cs" recurse="false"/>