From 25a67916277b1417bca16c3427fdabdb1ce9e1f4 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Wed, 8 Aug 2007 21:23:42 +0000
Subject: * Checked in new tweaked Prebuild.exe * Ignored binaries

---
 OpenSim/Grid/AssetServer/Main.cs             |  40 ---------------------------
 OpenSim/Region/ClientStack/ClientViewBase.cs |   5 ++++
 bin/Prebuild.exe                             | Bin 176128 -> 176128 bytes
 3 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index b581a1e..eabaebc 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -91,50 +91,10 @@ namespace OpenSim.Grid.AssetServer
             httpServer.AddStreamHandler( new GetAssetStreamHandler(this));
             httpServer.AddStreamHandler(new PostAssetStreamHandler( this ));
 
-            //httpServer.AddRestHandler("GET", "/assets/", this.assetGetMethod);
-            //httpServer.AddRestHandler("POST", "/assets/", this.assetPostMethod);
-
             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)
         {
             bool found = false;
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index 2cd730b..0b2c875 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -79,9 +79,14 @@ namespace OpenSim.Region.ClientStack
                 lock (SequenceLock)
                 {
                     if (Sequence >= MAX_SEQUENCE)
+                    {
                         Sequence = 1;
+                    }
                     else
+                    {
                         Sequence++;
+                    }
+
                     Pack.Header.Sequence = Sequence;
                 }
 
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index f8ac8d9..d911311 100755
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
-- 
cgit v1.1