diff options
author | MW | 2007-08-01 16:50:20 +0000 |
---|---|---|
committer | MW | 2007-08-01 16:50:20 +0000 |
commit | edc572dacf3ff65c5584f8c02bb291abce0c7122 (patch) | |
tree | 0e1c8802d3bb8406883d01a1648b20d36215ec4e /OpenSim/Framework | |
parent | remove Adam's work around, this shouldn't be needed any more (diff) | |
download | opensim-SC_OLD-edc572dacf3ff65c5584f8c02bb291abce0c7122.zip opensim-SC_OLD-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.gz opensim-SC_OLD-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.bz2 opensim-SC_OLD-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.xz |
Some more work on SceneObject/primitive rewrites (AllNewSceneObjectGroup2 /Part2).
Updated the JavaVM to a later version I did (basically some clean up and a little bit more functional).
Added SendLoadURL method to IClientAPI.
Diffstat (limited to '')
5 files changed, 17 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 05fa963..d133617 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Capabilities | |||
48 | private string m_requestPath = "0000/"; | 48 | private string m_requestPath = "0000/"; |
49 | private string m_mapLayerPath = "0001/"; | 49 | private string m_mapLayerPath = "0001/"; |
50 | private string m_newInventory = "0002/"; | 50 | private string m_newInventory = "0002/"; |
51 | // private string m_requestTexture = "0003/"; | 51 | //private string m_requestTexture = "0003/"; |
52 | private string m_notecardUpdatePath = "0004/"; | 52 | private string m_notecardUpdatePath = "0004/"; |
53 | //private string eventQueue = "0100/"; | 53 | //private string eventQueue = "0100/"; |
54 | private BaseHttpServer httpListener; | 54 | private BaseHttpServer httpListener; |
@@ -79,6 +79,7 @@ namespace OpenSim.Region.Capabilities | |||
79 | httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest)); | 79 | httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest)); |
80 | 80 | ||
81 | AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); | 81 | AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest); |
82 | //AddLegacyCapsHandler(httpListener, m_requestTexture , RequestTexture); | ||
82 | AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory); | 83 | AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory); |
83 | } | 84 | } |
84 | 85 | ||
@@ -116,7 +117,6 @@ namespace OpenSim.Region.Capabilities | |||
116 | string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath; | 117 | string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath; |
117 | caps.MapLayer = capsBaseUrl + m_mapLayerPath; | 118 | caps.MapLayer = capsBaseUrl + m_mapLayerPath; |
118 | caps.NewFileAgentInventory = capsBaseUrl + m_newInventory; | 119 | caps.NewFileAgentInventory = capsBaseUrl + m_newInventory; |
119 | //caps.RequestTextureDownload = capsBaseUrl + m_requestTexture; | ||
120 | caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath; | 120 | caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath; |
121 | return caps; | 121 | return caps; |
122 | } | 122 | } |
@@ -299,7 +299,7 @@ namespace OpenSim.Region.Capabilities | |||
299 | private LLUUID newAssetID; | 299 | private LLUUID newAssetID; |
300 | private LLUUID inventoryItemID; | 300 | private LLUUID inventoryItemID; |
301 | private BaseHttpServer httpListener; | 301 | private BaseHttpServer httpListener; |
302 | private bool SaveImages = false; | 302 | private bool SaveAssets = false; |
303 | private string m_assetName = ""; | 303 | private string m_assetName = ""; |
304 | 304 | ||
305 | /// <summary> | 305 | /// <summary> |
@@ -338,8 +338,8 @@ namespace OpenSim.Region.Capabilities | |||
338 | 338 | ||
339 | httpListener.RemoveStreamHandler("POST", uploaderPath); | 339 | httpListener.RemoveStreamHandler("POST", uploaderPath); |
340 | 340 | ||
341 | if(this.SaveImages) | 341 | if(this.SaveAssets) |
342 | this.SaveImageToFile(m_assetName + ".jp2", data); | 342 | this.SaveAssetToFile(m_assetName + ".jp2", data); |
343 | 343 | ||
344 | if (OnUpLoad != null) | 344 | if (OnUpLoad != null) |
345 | { | 345 | { |
@@ -349,7 +349,7 @@ namespace OpenSim.Region.Capabilities | |||
349 | return res; | 349 | return res; |
350 | } | 350 | } |
351 | 351 | ||
352 | private void SaveImageToFile(string filename, byte[] data) | 352 | private void SaveAssetToFile(string filename, byte[] data) |
353 | { | 353 | { |
354 | FileStream fs = File.Create(filename); | 354 | FileStream fs = File.Create(filename); |
355 | BinaryWriter bw = new BinaryWriter(fs); | 355 | BinaryWriter bw = new BinaryWriter(fs); |
@@ -360,3 +360,4 @@ namespace OpenSim.Region.Capabilities | |||
360 | } | 360 | } |
361 | } | 361 | } |
362 | } | 362 | } |
363 | |||
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs index cae7e97..913d7ab 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs | |||
@@ -6,9 +6,10 @@ namespace OpenSim.Region.Capabilities | |||
6 | public string MapLayer = ""; | 6 | public string MapLayer = ""; |
7 | public string NewFileAgentInventory = ""; | 7 | public string NewFileAgentInventory = ""; |
8 | //public string EventQueueGet = ""; | 8 | //public string EventQueueGet = ""; |
9 | //public string RequestTextureDownload = ""; | 9 | // public string RequestTextureDownload = ""; |
10 | //public string ChatSessionRequest = ""; | 10 | // public string ChatSessionRequest = ""; |
11 | public string UpdateNotecardAgentInventory = ""; | 11 | public string UpdateNotecardAgentInventory = ""; |
12 | // public string ParcelVoiceInfoRequest = ""; | ||
12 | 13 | ||
13 | public LLSDCapsDetails() | 14 | public LLSDCapsDetails() |
14 | { | 15 | { |
@@ -16,3 +17,5 @@ namespace OpenSim.Region.Capabilities | |||
16 | } | 17 | } |
17 | } | 18 | } |
18 | } | 19 | } |
20 | |||
21 | |||
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs index 3162e9c..5320196 100644 --- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs +++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs | |||
@@ -211,5 +211,6 @@ namespace OpenSim.Framework.Interfaces | |||
211 | void SendNameReply(LLUUID profileId, string firstname, string lastname); | 211 | void SendNameReply(LLUUID profileId, string firstname, string lastname); |
212 | void SendAlertMessage(string message); | 212 | void SendAlertMessage(string message); |
213 | void SendAgentAlertMessage(string message, bool modal); | 213 | void SendAgentAlertMessage(string message, bool modal); |
214 | void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url); | ||
214 | } | 215 | } |
215 | } | 216 | } |
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs index 7c6c6689..017828e 100644 --- a/OpenSim/Framework/General/NullClientAPI.cs +++ b/OpenSim/Framework/General/NullClientAPI.cs | |||
@@ -142,5 +142,8 @@ namespace OpenSim.Framework | |||
142 | public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){} | 142 | public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){} |
143 | public void SendAlertMessage(string message) { } | 143 | public void SendAlertMessage(string message) { } |
144 | public void SendAgentAlertMessage(string message, bool modal) { } | 144 | public void SendAgentAlertMessage(string message, bool modal) { } |
145 | public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url) { } | ||
146 | |||
145 | } | 147 | } |
146 | } | 148 | } |
149 | |||
diff --git a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs b/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs index 9f681c2..f2e6128 100644 --- a/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs +++ b/OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs | |||
@@ -133,4 +133,4 @@ namespace OpenSim.Framework.InventoryServiceBase | |||
133 | } | 133 | } |
134 | } | 134 | } |
135 | } | 135 | } |
136 | } | 136 | } \ No newline at end of file |