Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

14 files changed, 143 insertions, 212 deletions

diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
index 17dbcd5..2dade5b 100644
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
@@ -42,7 +42,6 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Capabilities.Handlers
 {
-
     public class WebFetchInvDescHandler 
     {
         private static readonly ILog m_log =
@@ -50,7 +49,7 @@ namespace OpenSim.Capabilities.Handlers
 
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
-        private object m_fetchLock = new Object();
+//        private object m_fetchLock = new Object();
 
         public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
         {
@@ -60,39 +59,40 @@ namespace OpenSim.Capabilities.Handlers
 
         public string FetchInventoryDescendentsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
-//            m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Received request");
-
-            // nasty temporary hack here, the linden client falsely
-            // identifies the uuid 00000000-0000-0000-0000-000000000000
-            // as a string which breaks us
-            //
-            // correctly mark it as a uuid
-            //
-            request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>");
-
-            // another hack <integer>1</integer> results in a
-            // System.ArgumentException: Object type System.Int32 cannot
-            // be converted to target type: System.Boolean
-            //
-            request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>");
-            request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>");
-
-            Hashtable hash = new Hashtable();
-            try
-            {
-                hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
-            }
-            catch (LLSD.LLSDParseException pe)
-            {
-                m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message);
-                m_log.Error("Request: " + request.ToString());
-            }
-
-            ArrayList foldersrequested = (ArrayList)hash["folders"];
+//            lock (m_fetchLock)
+//            {
+//                m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Received request {0}", request);
+    
+                // nasty temporary hack here, the linden client falsely
+                // identifies the uuid 00000000-0000-0000-0000-000000000000
+                // as a string which breaks us
+                //
+                // correctly mark it as a uuid
+                //
+                request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>");
+    
+                // another hack <integer>1</integer> results in a
+                // System.ArgumentException: Object type System.Int32 cannot
+                // be converted to target type: System.Boolean
+                //
+                request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>");
+                request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>");
+    
+                Hashtable hash = new Hashtable();
+                try
+                {
+                    hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
+                }
+                catch (LLSD.LLSDParseException e)
+                {
+                    m_log.ErrorFormat("[WEB FETCH INV DESC HANDLER]: Fetch error: {0}{1}" + e.Message, e.StackTrace);
+                    m_log.Error("Request: " + request);
+                }
+    
+                ArrayList foldersrequested = (ArrayList)hash["folders"];
+    
+                string response = "";
 
-            string response = "";
-            lock (m_fetchLock)
-            {
                 for (int i = 0; i < foldersrequested.Count; i++)
                 {
                     string inventoryitemstr = "";
@@ -106,7 +106,7 @@ namespace OpenSim.Capabilities.Handlers
                     }
                     catch (Exception e)
                     {
-                        m_log.Debug("[CAPS]: caught exception doing OSD deserialize" + e);
+                        m_log.Debug("[WEB FETCH INV DESC HANDLER]: caught exception doing OSD deserialize" + e);
                     }
                     LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest);
 
@@ -117,7 +117,6 @@ namespace OpenSim.Capabilities.Handlers
                     response += inventoryitemstr;
                 }
 
-
                 if (response.Length == 0)
                 {
                     // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants.
@@ -131,11 +130,12 @@ namespace OpenSim.Capabilities.Handlers
                     response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>";
                 }
 
-                //m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml");
-                //m_log.Debug("[CAPS] "+response);
+//                m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Replying to CAPS fetch inventory request");
+                //m_log.Debug("[WEB FETCH INV DESC HANDLER] "+response);
 
-            }
-            return response;
+                return response;
+
+//            }
         }
 
         /// <summary>
@@ -184,16 +184,31 @@ namespace OpenSim.Capabilities.Handlers
             return reply;
         }
 
-        public InventoryCollection Fetch(UUID agentID, UUID folderID, UUID ownerID,
-                                            bool fetchFolders, bool fetchItems, int sortOrder, out int version)
+        /// <summary>
+        /// Handle the caps inventory descendents fetch.
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="folderID"></param>
+        /// <param name="ownerID"></param>
+        /// <param name="fetchFolders"></param>
+        /// <param name="fetchItems"></param>
+        /// <param name="sortOrder"></param>
+        /// <param name="version"></param>
+        /// <returns>An empty InventoryCollection if the inventory look up failed</returns>
+        public InventoryCollection Fetch(
+            UUID agentID, UUID folderID, UUID ownerID,
+            bool fetchFolders, bool fetchItems, int sortOrder, out int version)
         {
-            m_log.DebugFormat(
-                "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
-                fetchFolders, fetchItems, folderID, agentID);
+//            m_log.DebugFormat(
+//                "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
+//                fetchFolders, fetchItems, folderID, agentID);
+
+            // FIXME MAYBE: We're not handling sortOrder!
 
             version = 0;
             InventoryFolderImpl fold;
             if (m_LibraryService != null && m_LibraryService.LibraryRootFolder != null && agentID == m_LibraryService.LibraryRootFolder.Owner)
+            {
                 if ((fold = m_LibraryService.LibraryRootFolder.FindFolder(folderID)) != null)
                 {
                     InventoryCollection ret = new InventoryCollection();
@@ -202,6 +217,7 @@ namespace OpenSim.Capabilities.Handlers
 
                     return ret;
                 }
+            }
 
             InventoryCollection contents = new InventoryCollection();
 
@@ -217,7 +233,7 @@ namespace OpenSim.Capabilities.Handlers
             }
             else
             {
-                // Lost itemsm don't really need a version
+                // Lost items don't really need a version
                 version = 1;
             }
 
@@ -235,10 +251,11 @@ namespace OpenSim.Capabilities.Handlers
             llsdFolder.folder_id = invFolder.ID;
             llsdFolder.parent_id = invFolder.ParentID;
             llsdFolder.name = invFolder.Name;
-            if (invFolder.Type < 0 || invFolder.Type >= TaskInventoryItem.Types.Length)
+
+            if (invFolder.Type == (short)AssetType.Unknown || !Enum.IsDefined(typeof(AssetType), (sbyte)invFolder.Type))
                 llsdFolder.type = "-1";
             else
-                llsdFolder.type = TaskInventoryItem.Types[invFolder.Type];
+                llsdFolder.type = Utils.AssetTypeToString((AssetType)invFolder.Type);
             llsdFolder.preferred_type = "-1";
 
             return llsdFolder;
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index f10b857..a0d3541 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -565,7 +565,7 @@ namespace OpenSim.Framework.Console
     /// </summary>
     public class CommandConsole : ConsoleBase, ICommandConsole
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public ICommands Commands { get; private set; }
 
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 30d775c..ba2a306 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -40,63 +40,6 @@ namespace OpenSim.Framework
         /// </summary>
         private const uint FULL_MASK_PERMISSIONS_GENERAL = 2147483647;
 
-        /// <summary>
-        /// Inventory types
-        /// </summary>
-        public static string[] InvTypes = new string[]
-            {
-                "texture",
-                "sound",
-                "calling_card",
-                "landmark",
-                String.Empty,
-                String.Empty,
-                "object",
-                "notecard",
-                String.Empty,
-                String.Empty,
-                "lsl_text",
-                String.Empty,
-                String.Empty,
-                "bodypart",
-                String.Empty,
-                "snapshot",
-                String.Empty,
-                String.Empty,
-                "wearable",
-                "animation",
-                "gesture"
-            };
-
-        /// <summary>
-        /// Asset types
-        /// </summary>
-        public static string[] Types = new string[]
-            {
-                "texture",
-                "sound",
-                "callcard",
-                "landmark",
-                "clothing", // Deprecated
-                "clothing",
-                "object",
-                "notecard",
-                "category",
-                "root",
-                "lsltext",
-                "lslbyte",
-                "txtr_tga",
-                "bodypart",
-                "trash",
-                "snapshot",
-                "lstndfnd",
-                "snd_wav",
-                "img_tga",
-                "jpeg",
-                "animatn",
-                "gesture"
-            };
-
         private UUID _assetID = UUID.Zero;
 
         private uint _baseMask = FULL_MASK_PERMISSIONS_GENERAL;
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index c6be79e..b761dfe 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Framework
                     return result;
                 }
             }
-            catch (Exception e)
+            catch
             {
                 // don't need to treat this as an error... we're just guessing anyway
 //                m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index b93a41b..8f0ae76 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -134,7 +134,6 @@ namespace OpenSim.Region.ClientStack.Linden
             AddNewInventoryItem = m_Scene.AddUploadedInventoryItem;
             ItemUpdatedCall = m_Scene.CapsUpdateInventoryItemAsset;
             TaskScriptUpdatedCall = m_Scene.CapsUpdateTaskInventoryScriptAsset;
-            CAPSFetchInventoryDescendents = m_Scene.HandleFetchInventoryDescendentsCAPS;
             GetClient = m_Scene.SceneGraph.GetControllingClient;
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 1c1d83c..10f43d1 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -42,18 +42,25 @@ using OpenSim.Capabilities.Handlers;
 
 namespace OpenSim.Region.ClientStack.Linden
 {
-
+    /// <summary>
+    /// This module implements both WebFetchInventoryDescendents and FetchInventoryDescendents2 capabilities.
+    /// </summary>
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
     public class WebFetchInvDescModule : INonSharedRegionModule
     {
-        private static readonly ILog m_log =
-            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private Scene m_scene;
 
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
-        private bool m_Enabled = false;
-        private string m_URL;
+
+        private bool m_Enabled;
+
+        private string m_fetchInventoryDescendents2Url;
+        private string m_webFetchInventoryDescendentsUrl;
+
+        private WebFetchInvDescHandler m_webFetchHandler;
 
         #region ISharedRegionModule Members
 
@@ -63,10 +70,13 @@ namespace OpenSim.Region.ClientStack.Linden
             if (config == null)
                 return;
 
-            m_URL = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty);
-            // Cap doesn't exist
-            if (m_URL != string.Empty)
+            m_fetchInventoryDescendents2Url = config.GetString("Cap_FetchInventoryDescendents2", string.Empty);
+            m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty);
+
+            if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty)
+            {
                 m_Enabled = true;
+            }
         }
 
         public void AddRegion(Scene s)
@@ -91,8 +101,13 @@ namespace OpenSim.Region.ClientStack.Linden
             if (!m_Enabled)
                 return;
 
-            m_InventoryService = m_scene.InventoryService; ;
+            m_InventoryService = m_scene.InventoryService;
             m_LibraryService = m_scene.LibraryService;
+
+            // We'll reuse the same handler for all requests.
+            if (m_fetchInventoryDescendents2Url == "localhost" || m_webFetchInventoryDescendentsUrl == "localhost")
+                m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
         }
 
@@ -111,26 +126,38 @@ namespace OpenSim.Region.ClientStack.Linden
 
         #endregion
 
-        public void RegisterCaps(UUID agentID, Caps caps)
+        private void RegisterCaps(UUID agentID, Caps caps)
         {
-            UUID capID = UUID.Random();
+            if (m_webFetchInventoryDescendentsUrl != "")
+                RegisterFetchCap(agentID, caps, "WebFetchInventoryDescendents", m_webFetchInventoryDescendentsUrl);
 
-            //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
-            if (m_URL == "localhost")
+            if (m_fetchInventoryDescendents2Url != "")
+                RegisterFetchCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
+        }
+
+        private void RegisterFetchCap(UUID agentID, Caps caps, string capName, string url)
+        {
+            string capUrl;
+
+            if (url == "localhost")
             {
-                m_log.InfoFormat("[WEBFETCHINVENTORYDESCENDANTS]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
-                WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
-                IRequestHandler reqHandler = new RestStreamHandler("POST", "/CAPS/" + UUID.Random(), webFetchHandler.FetchInventoryDescendentsRequest);
-                caps.RegisterHandler("WebFetchInventoryDescendents", reqHandler);
-//                caps.RegisterHandler("FetchInventoryDescendents2", reqHandler);
+                capUrl = "/CAPS/" + UUID.Random();
+
+                IRequestHandler reqHandler
+                    = new RestStreamHandler("POST", capUrl, m_webFetchHandler.FetchInventoryDescendentsRequest);
+
+                caps.RegisterHandler(capName, reqHandler);
             }
             else
             {
-                m_log.InfoFormat("[WEBFETCHINVENTORYDESCENDANTS]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
-                caps.RegisterHandler("WebFetchInventoryDescendents", m_URL);
-//                caps.RegisterHandler("FetchInventoryDescendents2", m_URL);
+                capUrl = url;
+
+                caps.RegisterHandler(capName, capUrl);
             }
-        }
 
+//            m_log.DebugFormat(
+//                "[WEB FETCH INV DESC MODULE]: Registered capability {0} at {1} in region {2} for {3}",
+//                capName, capUrl, m_scene.RegionInfo.RegionName, agentID);
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 270e582..6ba74c7 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -330,7 +330,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
             }
-         }
+        }
 
         public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs)
         {
@@ -484,6 +484,7 @@ namespace OpenSim.Region.Framework.Scenes
             // can be handled transparently).
             InventoryFolderImpl fold = null;
             if (LibraryService != null && LibraryService.LibraryRootFolder != null)
+            {
                 if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null)
                 {
                     remoteClient.SendInventoryFolderDetails(
@@ -491,6 +492,7 @@ namespace OpenSim.Region.Framework.Scenes
                         fold.RequestListOfFolders(), fold.Version, fetchFolders, fetchItems);
                     return;
                 }
+            }
 
             // We're going to send the reply async, because there may be
             // an enormous quantity of packets -- basically the entire inventory!
@@ -511,64 +513,6 @@ namespace OpenSim.Region.Framework.Scenes
             SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState;
             d.EndInvoke(iar);
         }
-
-        /// <summary>
-        /// Handle the caps inventory descendents fetch.
-        ///
-        /// Since the folder structure is sent to the client on login, I believe we only need to handle items.
-        /// Diva comment 8/13/2009: what if someone gave us a folder in the meantime??
-        /// </summary>
-        /// <param name="agentID"></param>
-        /// <param name="folderID"></param>
-        /// <param name="ownerID"></param>
-        /// <param name="fetchFolders"></param>
-        /// <param name="fetchItems"></param>
-        /// <param name="sortOrder"></param>
-        /// <returns>null if the inventory look up failed</returns>
-        public InventoryCollection HandleFetchInventoryDescendentsCAPS(UUID agentID, UUID folderID, UUID ownerID,
-                                                   bool fetchFolders, bool fetchItems, int sortOrder, out int version)
-        {
-            m_log.DebugFormat(
-                "[INVENTORY CACHE]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
-                fetchFolders, fetchItems, folderID, agentID);
-
-            // FIXME MAYBE: We're not handling sortOrder!
-
-            // TODO: This code for looking in the folder for the library should be folded back into the
-            // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc.
-            // can be handled transparently).
-            InventoryFolderImpl fold;
-            if (LibraryService != null && LibraryService.LibraryRootFolder != null)
-                if ((fold = LibraryService.LibraryRootFolder.FindFolder(folderID)) != null)
-                {
-                    version = 0;
-                    InventoryCollection ret = new InventoryCollection();
-                    ret.Folders = new List<InventoryFolderBase>();
-                    ret.Items = fold.RequestListOfItems();
-
-                    return ret;
-                }
-
-            InventoryCollection contents = new InventoryCollection();
-
-            if (folderID != UUID.Zero)
-            {
-                contents = InventoryService.GetFolderContent(agentID, folderID); 
-                InventoryFolderBase containingFolder = new InventoryFolderBase();
-                containingFolder.ID = folderID;
-                containingFolder.Owner = agentID;
-                containingFolder = InventoryService.GetFolder(containingFolder);
-                version = containingFolder.Version;
-            }
-            else
-            {
-                // Lost itemsm don't really need a version
-                version = 1;
-            }
-
-            return contents;
-
-        }
         
         /// <summary>
         /// Handle an inventory folder creation request from the client.
@@ -643,14 +587,13 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        delegate void PurgeFolderDelegate(UUID userID, UUID folder);
+
         /// <summary>
         /// This should delete all the items and folders in the given directory.
         /// </summary>
         /// <param name="remoteClient"></param>
         /// <param name="folderID"></param>
-
-        delegate void PurgeFolderDelegate(UUID userID, UUID folder);
-
         public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID)
         {
             PurgeFolderDelegate d = PurgeFolderAsync;
@@ -664,7 +607,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-
         private void PurgeFolderAsync(UUID userID, UUID folderID)
         {
             InventoryFolderBase folder = new InventoryFolderBase(folderID, userID);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index d80944b..daddb90 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -832,8 +832,8 @@ namespace OpenSim.Region.Framework.Scenes
                         invString.AddSectionEnd();
 
                         invString.AddNameValueLine("asset_id", item.AssetID.ToString());
-                        invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
-                        invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
+                        invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type));
+                        invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType));
                         invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
 
                         invString.AddSaleStart();
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 7ab295a..2a6163c 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Physics.Manager
 
     public abstract class PhysicsScene
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
         /// Name of this scene.  Useful in debug messages to distinguish one OdeScene instance from another.
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 489a23a..73c1c02 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         private float CAPSULE_RADIUS = 0.37f;
         private float CAPSULE_LENGTH = 2.140599f;
         private float m_tensor = 3800000f;
-        private float heightFudgeFactor = 0.52f;
+//        private float heightFudgeFactor = 0.52f;
         private float walkDivisor = 1.3f;
         private float runDivisor = 0.8f;
         private bool flying = false;
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         public OdeCharacter(
             String avName, OdeScene parent_scene, Vector3 pos, Vector3 size, float pid_d, float pid_p,
-            float capsule_radius, float tensor, float density, float height_fudge_factor,
+            float capsule_radius, float tensor, float density,
             float walk_divisor, float rundivisor)
         {
             m_uuid = UUID.Random();
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             CAPSULE_RADIUS = capsule_radius;
             m_tensor = tensor;
             m_density = density;
-            heightFudgeFactor = height_fudge_factor;
+//            heightFudgeFactor = height_fudge_factor;
             walkDivisor = walk_divisor;
             runDivisor = rundivisor;
 
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 0456f56..5b28e7c 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode
         public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } }
         private float avDensity = 80f;
-        private float avHeightFudgeFactor = 0.52f;
+//        private float avHeightFudgeFactor = 0.52f;
         private float avMovementDivisorWalk = 1.3f;
         private float avMovementDivisorRun = 0.8f;
         private float minimumGroundFlightOffset = 3f;
@@ -316,7 +316,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         private int m_physicsiterations = 10;
         private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag
         private readonly PhysicsActor PANull = new NullPhysicsActor();
-        private float step_time = 0.0f;
+//        private float step_time = 0.0f;
 //Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
 //Ckrinke        private int ms = 0;
         public IntPtr world;
@@ -479,7 +479,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10);
 
                     avDensity = physicsconfig.GetFloat("av_density", 80f);
-                    avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f);
+//                    avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f);
                     avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f);
                     avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f);
                     avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f);
@@ -1706,7 +1706,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             OdeCharacter newAv
                 = new OdeCharacter(
                     avName, this, pos, size, avPIDD, avPIDP,
-                    avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor,
+                    avCapRadius, avStandupTensor, avDensity,
                     avMovementDivisorWalk, avMovementDivisorRun);
 
             newAv.Flying = isFlying;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 5527d14..3eeb23d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                 List<SenseRepeatClass> NewSensors = new List<SenseRepeatClass>();
                 foreach (SenseRepeatClass ts in SenseRepeaters)
                 {
-                    if (ts.localID != m_localID && ts.itemID != m_itemID)
+                    if (ts.localID != m_localID || ts.itemID != m_itemID)
                     {
                         NewSensors.Add(ts);
                     }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index f9af9c1..f9d6eee 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 {
     public class ScriptInstance : MarshalByRefObject, IScriptInstance
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         private IScriptEngine m_Engine;
         private IScriptWorkItem m_CurrentResult = null;
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5fe1352..972efe4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -507,8 +507,7 @@
     ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
     ; will also be affected.
     ;
-    ;DisableFacelights = "false"
-
+    ;DisableFacelights = "false(1815)
 
 [ClientStack.LindenCaps]
         ;; Long list of capabilities taken from 
@@ -574,11 +573,14 @@
     Cap_UploadObjectAsset = "localhost"
     Cap_ViewerStartAuction = ""
     Cap_ViewerStats = ""
-        ; This last one is supported by OpenSim, but may
-        ; lead to poor sim performance if served by the simulators,
-        ; so it is disabled by default.
-    Cap_WebFetchInventoryDescendents = ""
 
+          ; The fetch inventory descendents caps are supported by OpenSim, but may
+          ; lead to poor sim performance if served by the simulators,
+          ; so they are disabled by default.
+    ; FetchInventoryDescendents2 is the one used in the latest Linden Lab viewers (from some point in the v2 series and above)
+    Cap_WebFetchInventoryDescendents = ""
+    Cap_FetchInventoryDescendents2 = ""
+    
 
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
@@ -722,7 +724,8 @@
     av_density = 80
 
     ; use this value to cut 52% of the height the sim gives us
-    av_height_fudge_factor = 0.52
+    ; Currently unused
+    ; av_height_fudge_factor = 0.52
 
     ; Movement.  Smaller is faster.