ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 12:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some more work on SceneObject/primitive rewrites (AllNewSceneObjectGroup2 /Part2).

Browse Source 
Updated the JavaVM to a later version I did (basically some clean up and a little bit more functional).
Added SendLoadURL method to IClientAPI.
This commit is contained in:
MW
2007-08-01 16:50:20 +00:00
parent 2e6505f38e
commit edc572dacf
19 changed files with 580 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@@ -48,7 +48,7 @@ namespace OpenSim.Region.Capabilities
private string m_requestPath = "0000/";
private string m_mapLayerPath = "0001/";
private string m_newInventory = "0002/";
// private string m_requestTexture = "0003/";
//private string m_requestTexture = "0003/";
private string m_notecardUpdatePath = "0004/";
//private string eventQueue = "0100/";
private BaseHttpServer httpListener;
@@ -79,6 +79,7 @@ namespace OpenSim.Region.Capabilities
httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));
AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);
//AddLegacyCapsHandler(httpListener, m_requestTexture , RequestTexture);
AddLegacyCapsHandler(httpListener, m_notecardUpdatePath, NoteCardAgentInventory);
}
@@ -116,7 +117,6 @@ namespace OpenSim.Region.Capabilities
string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + m_capsObjectPath;
caps.MapLayer = capsBaseUrl + m_mapLayerPath;
caps.NewFileAgentInventory = capsBaseUrl + m_newInventory;
//caps.RequestTextureDownload = capsBaseUrl + m_requestTexture;
caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath;
return caps;
}
@@ -299,7 +299,7 @@ namespace OpenSim.Region.Capabilities
private LLUUID newAssetID;
private LLUUID inventoryItemID;
private BaseHttpServer httpListener;
private bool SaveImages = false;
private bool SaveAssets = false;
private string m_assetName = "";
/// <summary>
@@ -338,8 +338,8 @@ namespace OpenSim.Region.Capabilities
httpListener.RemoveStreamHandler("POST", uploaderPath);
if(this.SaveImages)
this.SaveImageToFile(m_assetName + ".jp2", data);
if(this.SaveAssets)
this.SaveAssetToFile(m_assetName + ".jp2", data);
if (OnUpLoad != null)
{
@@ -349,7 +349,7 @@ namespace OpenSim.Region.Capabilities
return res;
}
private void SaveImageToFile(string filename, byte[] data)
private void SaveAssetToFile(string filename, byte[] data)
{
FileStream fs = File.Create(filename);
BinaryWriter bw = new BinaryWriter(fs);
@@ -360,3 +360,4 @@ namespace OpenSim.Region.Capabilities
}
}
}

7
OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
View File

@@ -6,9 +6,10 @@ namespace OpenSim.Region.Capabilities
public string MapLayer = "";
public string NewFileAgentInventory = "";
//public string EventQueueGet = "";
//public string RequestTextureDownload = "";
//public string ChatSessionRequest = "";
// public string RequestTextureDownload = "";
// public string ChatSessionRequest = "";
public string UpdateNotecardAgentInventory = "";
// public string ParcelVoiceInfoRequest = "";
public LLSDCapsDetails()
{
@@ -16,3 +17,5 @@ namespace OpenSim.Region.Capabilities
}
}
}

1
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@@ -211,5 +211,6 @@ namespace OpenSim.Framework.Interfaces
void SendNameReply(LLUUID profileId, string firstname, string lastname);
void SendAlertMessage(string message);
void SendAgentAlertMessage(string message, bool modal);
void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url);
}
}

3
OpenSim/Framework/General/NullClientAPI.cs
View File

@@ -142,5 +142,8 @@ namespace OpenSim.Framework
public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}
public void SendAlertMessage(string message) { }
public void SendAgentAlertMessage(string message, bool modal) { }
public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url) { }
}
}

2
OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs
View File

@@ -133,4 +133,4 @@ namespace OpenSim.Framework.InventoryServiceBase
}
}
}
}
}