aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Capabilities/Caps.cs
diff options
context:
space:
mode:
authorlbsa712007-07-01 16:07:41 +0000
committerlbsa712007-07-01 16:07:41 +0000
commit06a8c132005b4ab804f25d54c0c0f899fc98e3a1 (patch)
tree2210d9426050c11035453631735fb1f324a070a7 /OpenSim/Region/Capabilities/Caps.cs
parentFixed SimpleApp - aka thankgoditssundaycommit (diff)
downloadopensim-SC_OLD-06a8c132005b4ab804f25d54c0c0f899fc98e3a1.zip
opensim-SC_OLD-06a8c132005b4ab804f25d54c0c0f899fc98e3a1.tar.gz
opensim-SC_OLD-06a8c132005b4ab804f25d54c0c0f899fc98e3a1.tar.bz2
opensim-SC_OLD-06a8c132005b4ab804f25d54c0c0f899fc98e3a1.tar.xz
MAJOR IP RESTRUCTURING
* moving towards IPEndPoints all over the place * trying to make the internal/external division
Diffstat (limited to 'OpenSim/Region/Capabilities/Caps.cs')
-rw-r--r--OpenSim/Region/Capabilities/Caps.cs17
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index 416a6bc..2bbf656 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -44,8 +44,8 @@ namespace OpenSim.Region.Capabilities
44 44
45 public class Caps 45 public class Caps
46 { 46 {
47 private string httpListenerAddress; 47 private string httpListenerHostName;
48 private uint httpListenPort; 48 private int httpListenPort;
49 private string capsObjectPath = "00001-"; 49 private string capsObjectPath = "00001-";
50 private string requestPath = "0000/"; 50 private string requestPath = "0000/";
51 private string mapLayerPath = "0001/"; 51 private string mapLayerPath = "0001/";
@@ -58,12 +58,12 @@ namespace OpenSim.Region.Capabilities
58 private int eventQueueCount = 1; 58 private int eventQueueCount = 1;
59 private Queue<string> CapsEventQueue = new Queue<string>(); 59 private Queue<string> CapsEventQueue = new Queue<string>();
60 60
61 public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent) 61 public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, int httpPort, string capsPath, LLUUID agent)
62 { 62 {
63 assetCache = assetCach; 63 assetCache = assetCach;
64 capsObjectPath = capsPath; 64 capsObjectPath = capsPath;
65 httpListener = httpServer; 65 httpListener = httpServer;
66 httpListenerAddress = httpListen; 66 httpListenerHostName = httpListen;
67 httpListenPort = httpPort; 67 httpListenPort = httpPort;
68 agentID = agent; 68 agentID = agent;
69 } 69 }
@@ -109,8 +109,11 @@ namespace OpenSim.Region.Capabilities
109 return capURLS;*/ 109 return capURLS;*/
110 110
111 LLSDCapsDetails caps = new LLSDCapsDetails(); 111 LLSDCapsDetails caps = new LLSDCapsDetails();
112 caps.MapLayer = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath; 112 string capsBaseUrl = "http://" + httpListenerHostName + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath;
113 caps.NewFileAgentInventory = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory; 113
114 caps.MapLayer = capsBaseUrl + mapLayerPath;
115 caps.NewFileAgentInventory = capsBaseUrl + newInventory;
116
114 return caps; 117 return caps;
115 } 118 }
116 119
@@ -206,7 +209,7 @@ namespace OpenSim.Region.Capabilities
206 string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000"); 209 string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
207 AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener); 210 AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
208 httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps); 211 httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
209 string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath; 212 string uploaderURL = "http://" + httpListenerHostName + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
210 //Console.WriteLine("uploader url is " + uploaderURL); 213 //Console.WriteLine("uploader url is " + uploaderURL);
211 res += "<llsd><map>"; 214 res += "<llsd><map>";
212 res += "<key>uploader</key><string>" + uploaderURL + "</string>"; 215 res += "<key>uploader</key><string>" + uploaderURL + "</string>";