diff options
author | MW | 2007-06-24 18:50:45 +0000 |
---|---|---|
committer | MW | 2007-06-24 18:50:45 +0000 |
commit | 525dc30e6faa9dbf460ff6fa67912df77ff68c75 (patch) | |
tree | 5dad18fac63a2ff960b6cf620706ee61bd3e62fc | |
parent | Hopefully enabled the OGS commsManager (diff) | |
download | opensim-SC-525dc30e6faa9dbf460ff6fa67912df77ff68c75.zip opensim-SC-525dc30e6faa9dbf460ff6fa67912df77ff68c75.tar.gz opensim-SC-525dc30e6faa9dbf460ff6fa67912df77ff68c75.tar.bz2 opensim-SC-525dc30e6faa9dbf460ff6fa67912df77ff68c75.tar.xz |
Disabled the EventQueueGet CAPS as its not yet fully functional.
Diffstat (limited to '')
-rw-r--r-- | Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/OpenSim.Region/Caps.cs | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs index f151f56..0784ffa 100644 --- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs +++ b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs | |||
@@ -6,8 +6,6 @@ namespace OpenGrid.Framework.Communications.OGS1 | |||
6 | { | 6 | { |
7 | public class GridCommsManager : CommunicationsManager | 7 | public class GridCommsManager : CommunicationsManager |
8 | { | 8 | { |
9 | |||
10 | |||
11 | public GridCommsManager() | 9 | public GridCommsManager() |
12 | { | 10 | { |
13 | GridServer = new OGS1GridServices(); | 11 | GridServer = new OGS1GridServices(); |
diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs index 7ec0c75..9cb921b 100644 --- a/OpenSim/OpenSim.Region/Caps.cs +++ b/OpenSim/OpenSim.Region/Caps.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Region | |||
77 | capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>"; | 77 | capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>"; |
78 | capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>"; | 78 | capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>"; |
79 | //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>"; | 79 | //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>"; |
80 | capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>"; | 80 | // capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>"; |
81 | return capURLS; | 81 | return capURLS; |
82 | } | 82 | } |
83 | 83 | ||
@@ -122,7 +122,7 @@ namespace OpenSim.Region | |||
122 | 122 | ||
123 | public string ProcessEventQueue(string request, string path, string param) | 123 | public string ProcessEventQueue(string request, string path, string param) |
124 | { | 124 | { |
125 | Console.WriteLine("event queue request " + request); | 125 | // Console.WriteLine("event queue request " + request); |
126 | string res = ""; | 126 | string res = ""; |
127 | res = this.CreateEmptyEventResponse(); | 127 | res = this.CreateEmptyEventResponse(); |
128 | return res; | 128 | return res; |