OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Checked in new tweaked Prebuild.exe 

* Ignored binaries
afrisby
lbsa71 2007-08-08 21:23:42 +00:00
parent 0a6628f333
commit 25a6791627
3 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Grid/AssetServer/Main.cs
View File

@ -91,50 +91,10 @@ namespace OpenSim.Grid.AssetServer
httpServer.AddStreamHandler( new GetAssetStreamHandler(this)); httpServer.AddStreamHandler( new GetAssetStreamHandler(this));
httpServer.AddStreamHandler(new PostAssetStreamHandler( this )); httpServer.AddStreamHandler(new PostAssetStreamHandler( this ));
//httpServer.AddRestHandler("GET", "/assets/", this.assetGetMethod);
//httpServer.AddRestHandler("POST", "/assets/", this.assetPostMethod);
httpServer.Start(); httpServer.Start();
} }
//public string AssetPostMethod(string requestBody, string path, string param)
//{
// AssetBase asset = new AssetBase();
// asset.Name = "";
// asset.FullID = new LLUUID(param);
// Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
// byte[] buffer = Windows1252Encoding.GetBytes(requestBody);
// asset.Data = buffer;
// AssetStorage store = new AssetStorage();
// store.Data = asset.Data;
// store.Name = asset.Name;
// store.UUID = asset.FullID;
// db.Set(store);
// db.Commit();
// return "";
//}
//public string AssetGetMethod(string request, string path, string param)
//{
// Console.WriteLine("got a request " + param);
// byte[] assetdata = GetAssetData(new LLUUID(param), false);
// if (assetdata != null)
// {
// Encoding Windows1252Encoding = Encoding.GetEncoding(1252);
// string ret = Windows1252Encoding.GetString(assetdata);
// //string ret = System.Text.Encoding.Unicode.GetString(assetdata);
// return ret;
// }
// else
// {
// return "";
// }
//}
public byte[] GetAssetData(LLUUID assetID, bool isTexture) public byte[] GetAssetData(LLUUID assetID, bool isTexture)
{ {
bool found = false; bool found = false;

5
OpenSim/Region/ClientStack/ClientViewBase.cs
View File

@ -79,9 +79,14 @@ namespace OpenSim.Region.ClientStack
lock (SequenceLock) lock (SequenceLock)
{ {
if (Sequence >= MAX_SEQUENCE) if (Sequence >= MAX_SEQUENCE)
{
Sequence = 1; Sequence = 1;
}
else else
{
Sequence++; Sequence++;
}
Pack.Header.Sequence = Sequence; Pack.Header.Sequence = Sequence;
} }

BIN
bin/Prebuild.exe
View File

Binary file not shown.