1 files changed, 31 insertions, 10 deletions

diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index 13a351d..416a6bc 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -1,17 +1,44 @@
+/*

+* Copyright (c) Contributors, http://www.openmetaverse.org/

+* See CONTRIBUTORS.TXT for a full list of copyright holders.

+*

+* Redistribution and use in source and binary forms, with or without

+* modification, are permitted provided that the following conditions are met:

+*     * Redistributions of source code must retain the above copyright

+*       notice, this list of conditions and the following disclaimer.

+*     * Redistributions in binary form must reproduce the above copyright

+*       notice, this list of conditions and the following disclaimer in the

+*       documentation and/or other materials provided with the distribution.

+*     * Neither the name of the OpenSim Project nor the

+*       names of its contributors may be used to endorse or promote products

+*       derived from this software without specific prior written permission.

+*

+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+* 

+*/

 using System;

 using System.Collections;

 using System.Collections.Generic;

 using System.Text;

 using System.IO;

 using System.Xml;

-using OpenSim.Servers;

+using OpenSim.Framework.Servers;

 using OpenSim.Framework;

 using OpenSim.Framework.Utilities;

 using OpenSim.Framework.Types;

-using OpenSim.Caches;

+using OpenSim.Region.Caches;

 using libsecondlife;

 

-namespace OpenSim.Region

+namespace OpenSim.Region.Capabilities

 {

     public delegate void UpLoadedTexture(LLUUID assetID, LLUUID inventoryItem, byte[] data);

 

@@ -126,14 +153,8 @@ namespace OpenSim.Region
 

         public string ProcessEventQueue(string request, string path, string param)

         {

-            //  Console.WriteLine("event queue request " + request);

             string res = "";

-            int timer = 0;

-

-            /*while ((timer < 200) || (this.CapsEventQueue.Count < 1))

-             {

-                 timer++;

-             }*/

+            

             if (this.CapsEventQueue.Count > 0)

             {

                 lock (this.CapsEventQueue)