diff options
| author | John Hurliman | 2010-09-08 15:09:34 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-08 15:09:34 -0700 |
| commit | 972ef925901dc496f090b9c2dc65d62103b6f982 (patch) | |
| tree | 116bcd328a73a994bbd3bdf59dcbc74c7a7a15c1 /OpenSim/Services/Connectors/SimianGrid | |
| parent | * Changed 11 calls for session info to the more optimized API method (diff) | |
| parent | Made the HG asset and inventory brokers use the Helo service in order to inst... (diff) | |
| download | opensim-SC_OLD-972ef925901dc496f090b9c2dc65d62103b6f982.zip opensim-SC_OLD-972ef925901dc496f090b9c2dc65d62103b6f982.tar.gz opensim-SC_OLD-972ef925901dc496f090b9c2dc65d62103b6f982.tar.bz2 opensim-SC_OLD-972ef925901dc496f090b9c2dc65d62103b6f982.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 8f601e8..30d3147 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
| @@ -84,6 +84,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 84 | CommonInit(source); | 84 | CommonInit(source); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | public SimianAssetServiceConnector(string url) | ||
| 88 | { | ||
| 89 | m_serverUrl = url; | ||
| 90 | } | ||
| 91 | |||
| 87 | public void Initialise(IConfigSource source) | 92 | public void Initialise(IConfigSource source) |
| 88 | { | 93 | { |
| 89 | IConfig moduleConfig = source.Configs["Modules"]; | 94 | IConfig moduleConfig = source.Configs["Modules"]; |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 470eccd..3953369 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs | |||
| @@ -91,6 +91,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 91 | CommonInit(source); | 91 | CommonInit(source); |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | public SimianInventoryServiceConnector(string url) | ||
| 95 | { | ||
| 96 | m_serverUrl = url; | ||
| 97 | } | ||
| 98 | |||
| 94 | public void Initialise(IConfigSource source) | 99 | public void Initialise(IConfigSource source) |
| 95 | { | 100 | { |
| 96 | IConfig moduleConfig = source.Configs["Modules"]; | 101 | IConfig moduleConfig = source.Configs["Modules"]; |