aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorArthur Valadares2009-08-25 10:28:22 -0300
committerArthur Valadares2009-08-25 10:28:22 -0300
commit9c9fa51b0f005f570df2e3e3b84dfa3974935995 (patch)
tree49553fb3d3513f826f360eb426e1be7242a92aaf /OpenSim/Grid
parentAdds osDrawPolygon to OSSL. Works a little different then other OS Drawing fu... (diff)
parentClosed the web request and stream in SynchronousRestSessionObjectPoster -- ma... (diff)
downloadopensim-SC-9c9fa51b0f005f570df2e3e3b84dfa3974935995.zip
opensim-SC-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.gz
opensim-SC-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.bz2
opensim-SC-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/InventoryServer/AuthedSessionCache.cs (renamed from OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs)2
-rw-r--r--OpenSim/Grid/InventoryServer/InventoryServiceBase.cs (renamed from OpenSim/Framework/Communications/InventoryServiceBase.cs)4
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs1
3 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs b/OpenSim/Grid/InventoryServer/AuthedSessionCache.cs
index d56e48a..dadf34a 100644
--- a/OpenSim/Framework/Communications/Cache/AuthedSessionCache.cs
+++ b/OpenSim/Grid/InventoryServer/AuthedSessionCache.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30 30
31namespace OpenSim.Framework.Communications.Cache 31namespace OpenSim.Grid.InventoryServer
32{ 32{
33 public class AuthedSessionCache 33 public class AuthedSessionCache
34 { 34 {
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Grid/InventoryServer/InventoryServiceBase.cs
index 309c415..f8b4949 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Grid/InventoryServer/InventoryServiceBase.cs
@@ -30,8 +30,10 @@ using System.Reflection;
30using log4net; 30using log4net;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Data; 32using OpenSim.Data;
33using OpenSim.Framework;
34using OpenSim.Framework.Communications;
33 35
34namespace OpenSim.Framework.Communications 36namespace OpenSim.Grid.InventoryServer
35{ 37{
36 /// <summary> 38 /// <summary>
37 /// Abstract base class used by local and grid implementations of an inventory service. 39 /// Abstract base class used by local and grid implementations of an inventory service.
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index c8035a4..f2631a7 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Grid.MessagingServer
65 { 65 {
66 ArgvConfigSource argvSource = new ArgvConfigSource(args); 66 ArgvConfigSource argvSource = new ArgvConfigSource(args);
67 argvSource.AddSwitch("Startup", "console", "c"); 67 argvSource.AddSwitch("Startup", "console", "c");
68 argvSource.AddSwitch("Startup", "xmlfile", "x");
68 69
69 IConfig startupConfig = argvSource.Configs["Startup"]; 70 IConfig startupConfig = argvSource.Configs["Startup"];
70 if (startupConfig != null) 71 if (startupConfig != null)