Merge branch 'master' of ssh://opensim/var/git/opensim

OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs

@@ -707,7 +707,9 @@ namespace OpenSim.Region.CoreModules.Asset
         {
             UuidGatherer gatherer = new UuidGatherer(m_AssetService);
 
+            HashSet<UUID> uniqueUuids = new HashSet<UUID>();
             Dictionary<UUID, AssetType> assets = new Dictionary<UUID, AssetType>();
+
             foreach (Scene s in m_Scenes)
             {
                 StampRegionStatusFile(s.RegionInfo.RegionID);
@@ -715,11 +717,11 @@ namespace OpenSim.Region.CoreModules.Asset
                 s.ForEachSOG(delegate(SceneObjectGroup e)
                 {                   
                     gatherer.GatherAssetUuids(e, assets);
-                });
-            }
 
                     foreach (UUID assetID in assets.Keys)
                     {
+                        uniqueUuids.Add(assetID);
+
                         string filename = GetFileName(assetID.ToString());
 
                         if (File.Exists(filename))
@@ -728,11 +730,20 @@ namespace OpenSim.Region.CoreModules.Asset
                         }
                         else if (storeUncached)
                         {
-                    m_AssetService.Get(assetID.ToString());
+                            AssetBase cachedAsset = m_AssetService.Get(assetID.ToString());
+                            if (cachedAsset == null && assets[assetID] != AssetType.Unknown)
+                                m_log.DebugFormat(
+                                "[FLOTSAM ASSET CACHE]: Could not find asset {0}, type {1} referenced by object {2} at {3} in scene {4} when pre-caching all scene assets",
+                                    assetID, assets[assetID], e.Name, e.AbsolutePosition, s.Name);
                         }
                     }
 
-            return assets.Keys.Count;
+                    assets.Clear();
+                });
+            }
+
+
+            return uniqueUuids.Count;
         }
 
         /// <summary>

OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs

@@ -75,7 +75,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         public void Close() { }
         public void PostInitialise() { }
 
-        
         ///<summary>
         ///
         ///</summary>
@@ -133,7 +132,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
         ///</summary>
         public void AddRegion(Scene scene)
         {
-            if (! m_enabled)
+            if (!m_enabled)
                 return;
 
             // Every shared region module has to maintain an indepedent list of
@@ -206,6 +205,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
 
             using (Image mapTile = tileGenerator.CreateMapTile())
             {
+                // XXX: The MapImageModule will return a null if the user has chosen not to create map tiles and there
+                // is no static map tile.
+                if (mapTile == null)
+                    return;
+
                 using (MemoryStream stream = new MemoryStream())
                 {
                     mapTile.Save(stream, ImageFormat.Jpeg);

OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs

@@ -113,7 +113,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                 //t = System.Environment.TickCount - t;
                 //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
 
-
                 if (drawPrimVolume)
                 {
                     DrawObjectVolume(m_scene, mapbmp);
@@ -121,7 +120,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             }
             else
             {
-                mapbmp = fetchTexture(m_scene.RegionInfo.RegionSettings.TerrainImageID);
+                mapbmp = FetchTexture(m_scene.RegionInfo.RegionSettings.TerrainImageID);
             }
             return mapbmp;
         }
@@ -232,11 +231,19 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 //             }
 //         }
 
-        private Bitmap fetchTexture(UUID id)
+        private Bitmap FetchTexture(UUID id)
         {
             AssetBase asset = m_scene.AssetService.Get(id.ToString());
-            m_log.DebugFormat("[MAPTILE]: Fetched static texture {0}, found: {1}", id, asset != null);
+
-            if (asset == null) return null;
+            if (asset != null)
+            {
+                m_log.DebugFormat("[MAPTILE]: Static map image texture {0} found for {1}", id, m_scene.Name);
+            }
+            else
+            {
+                m_log.WarnFormat("[MAPTILE]: Static map image texture {0} not found for {1}", id, m_scene.Name);
+                return null;
+            }
 
             ManagedImage managedImage;
             Image image;

OpenSim/Region/Framework/Scenes/UuidGatherer.cs

@@ -131,7 +131,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// within this object).
         /// </remarks>
         /// <param name="sceneObject">The scene object for which to gather assets</param>
-        /// <param name="assetUuids">The assets gathered</param>
+        /// <param name="assetUuids">
+        /// A dictionary which is populated with the asset UUIDs gathered and the type of that asset.
+        /// For assets where the type is not clear (e.g. UUIDs extracted from LSL and notecards), the type is Unknown.
+        /// </param>
         public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, AssetType> assetUuids)
         {
 //            m_log.DebugFormat(
@@ -261,8 +264,9 @@ namespace OpenSim.Region.Framework.Scenes
                     UUID uuid = new UUID(uuidMatch.Value);
 //                    m_log.DebugFormat("[ARCHIVER]: Recording {0} in text", uuid);
 
-                    // Assume AssetIDs embedded are textures.
+                    // Embedded asset references (if not false positives) could be for many types of asset, so we will
-                    assetUuids[uuid] = AssetType.Texture;
+                    // label these as unknown.
+                    assetUuids[uuid] = AssetType.Unknown;
                 }
             }
         }

OpenSim/Region/Physics/Manager/PhysicsScene.cs

@@ -43,7 +43,7 @@ namespace OpenSim.Region.Physics.Manager
     public delegate void JointDeactivated(PhysicsJoint joint);
     public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation"
 
-    public enum RayFilterFlags:ushort
+    public enum RayFilterFlags : ushort
     {
         // the flags
         water = 0x01,
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Physics.Manager
         ClosestHit = 0x8000,
 
         // some combinations
-        LSLPhanton = phantom | volumedtc,
+        LSLPhantom = phantom | volumedtc,
         PrimsNonPhantom = nonphysical | physical,
         PrimsNonPhantomAgents = nonphysical | physical | agent,
 

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -11381,7 +11381,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (checkNonPhysical)
                     rayfilter |= RayFilterFlags.nonphysical;
                 if (detectPhantom)
-                    rayfilter |= RayFilterFlags.LSLPhanton;
+                    rayfilter |= RayFilterFlags.LSLPhantom;
 
                 Vector3 direction = dir * ( 1/dist);
 

bin/OpenSim.ini.example

@@ -269,9 +269,10 @@
     ; DefaultScriptEngine = "XEngine"
 
     ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
-    ;; Map tile options. You can choose to generate no map tiles at all,
+    ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
-    ;; generate normal maptiles, or nominate an uploaded texture to
+    ;; be the map tile using the MaptileStaticUUID parameter in this section or for individual regions in
-    ;; be the map tile
+    ;; the regions config file(s).  If you do not want to upload map tiles at all, then you will need 
+    ;; to disable the MapImageServiceModule entirely.
     ; GenerateMaptiles = true
 
     ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0

bin/OpenSimDefaults.ini

@@ -1,6 +1,20 @@
 ; This file contains defaults for various settings in OpenSimulator.  These can be overriden
 ; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
 
+[XMLRPC]
+    ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
+    ;; If enabled and set to XmlRpcRouterModule, this will post an event, 
+    ;; "xmlrpc_uri(string)" to the script concurrently with the first 
+    ;; remote_data event. This will contain the fully qualified URI an 
+    ;; external site needs to use to send XMLRPC requests to that script
+    ;;   
+    ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
+    ;; will be registered with an external service via a configured uri
+    XmlRpcRouterModule = "XmlRpcRouterModule"
+
+    ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
+    XmlRpcPort = 20800
+
 
 [Startup]
     ; Console prompt