added PostGreSQL support

Conflicts:
	bin/lib32/BulletSim.dll
	bin/lib64/BulletSim.dll

.gitignore

@@ -89,3 +89,6 @@ OpenSim/Region/ScriptEngine/test-results/
 OpenSim/Tests/Common/test-results/
 OpenSim/Tests/test-results/
 test-results/
+
+/binteste
+/ferland

OpenSim/Data/IRegionData.cs

@@ -74,6 +74,8 @@ namespace OpenSim.Data
         RegionData Get(int x, int y, UUID ScopeID);
         List<RegionData> Get(int xStart, int yStart, int xEnd, int yEnd, UUID ScopeID);
 
+        RegionData GetEmptyCoordinates(UUID ScopeID, int desiredX, int desiredY);
+
         bool Store(RegionData data);
 
         bool SetDataItem(UUID principalID, string item, string value);

OpenSim/Data/MSSQL/MSSQLRegionData.cs

@@ -342,5 +342,21 @@ namespace OpenSim.Data.MSSQL
                 return RunCommand(cmd);
             }
         }
+
+        /// <summary>
+        /// GetEmptyCoordinates - return one coordinate at grid based on desired X,Y
+        /// </summary>
+        /// <param name="ScopeID"></param>
+        /// <param name="desiredX"></param>
+        /// <param name="desiredY"></param>
+        /// <returns></returns>
+        public RegionData GetEmptyCoordinates(UUID ScopeID, int desiredX, int desiredY)
+        {
+            RegionData region = new RegionData() { posX = desiredX, posY = desiredY };
+
+            // TODO: Search a empty spot and reserve it for a while;
+
+            return region;
+        }
     }
 }

OpenSim/Data/MySQL/MySQLRegionData.cs

@@ -336,5 +336,21 @@ namespace OpenSim.Data.MySQL
                 return RunCommand(cmd);
             }
         }
+
+        /// <summary>
+        /// GetEmptyCoordinates - return one coordinate at grid based on desired X,Y
+        /// </summary>
+        /// <param name="ScopeID"></param>
+        /// <param name="desiredX"></param>
+        /// <param name="desiredY"></param>
+        /// <returns></returns>
+        public RegionData GetEmptyCoordinates(UUID ScopeID, int desiredX, int desiredY)
+        {
+            RegionData region = new RegionData() { posX = desiredX, posY = desiredY };
+
+            // TODO: Search a empty spot and reserve it for a while;
+
+            return region;
+        }
     }
-}
+}

OpenSim/Data/Null/NullRegionData.cs

@@ -245,5 +245,21 @@ namespace OpenSim.Data.Null
 
             return ret;
         }
+
+        /// <summary>
+        /// GetEmptyCoordinates - return one coordinate at grid based on desired X,Y
+        /// </summary>
+        /// <param name="ScopeID"></param>
+        /// <param name="desiredX"></param>
+        /// <param name="desiredY"></param>
+        /// <returns></returns>
+        public RegionData GetEmptyCoordinates(UUID ScopeID, int desiredX, int desiredY)
+        {
+            RegionData region = new RegionData() { posX = desiredX, posY = desiredY };
+
+            // TODO: Search a empty spot and reserve it for a while;
+
+            return region;
+        }
     }
 }

OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs

@@ -87,21 +87,26 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
             {
                 if (RegisteredScenes.ContainsKey(updater.SimUUID))
                 {
-                    Scene scene = RegisteredScenes[updater.SimUUID];
-                    updater.DataReceived(data, scene);
+                    updater.DataReceived(data, RegisteredScenes[updater.SimUUID]);
                 }
-            }
-
-            if (updater.UpdateTimer == 0)
-            {
-                lock (Updaters)
+                
+                if (updater.UpdateTimer == 0)
                 {
-                    if (!Updaters.ContainsKey(updater.UpdaterID))
+                    lock (Updaters)
                     {
-                        Updaters.Remove(updater.UpdaterID);
+                        if (!Updaters.ContainsKey(updater.UpdaterID))
+                        {
+                            UUID idRemove = updater.UpdaterID;
+
+                            Updaters[idRemove] = null;
+                            updater = null;
+
+                            Updaters.Remove(idRemove);
+                        }
                     }
                 }
             }
+
         }
 
         public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
@@ -124,18 +129,17 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
         {
             if (RenderPlugins.ContainsKey(contentType))
             {
-                DynamicTextureUpdater updater = new DynamicTextureUpdater();
-                updater.SimUUID = simID;
-                updater.PrimID = primID;
-                updater.ContentType = contentType;
-                updater.Url = url;
-                updater.UpdateTimer = updateTimer;
-                updater.UpdaterID = UUID.Random();
-                updater.Params = extraParams;
-                updater.BlendWithOldTexture = SetBlending;
-                updater.FrontAlpha = AlphaValue;
-                updater.Face = face;
-                updater.Disp = disp;
+                DynamicTextureUpdater updater = new DynamicTextureUpdater() { SimUUID = simID, 
+                                                                                PrimID = primID, 
+                                                                                ContentType = contentType, 
+                                                                                Url = url, 
+                                                                                UpdateTimer = updateTimer, 
+                                                                                UpdaterID = UUID.Random(), 
+                                                                                Params = extraParams, 
+                                                                                BlendWithOldTexture = SetBlending, 
+                                                                                FrontAlpha = AlphaValue, 
+                                                                                Face = face, 
+                                                                                Disp = disp };
 
                 lock (Updaters)
                 {
@@ -169,19 +173,18 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
         {
             if (RenderPlugins.ContainsKey(contentType))
             {
-                DynamicTextureUpdater updater = new DynamicTextureUpdater();
-                updater.SimUUID = simID;
-                updater.PrimID = primID;
-                updater.ContentType = contentType;
-                updater.BodyData = data;
-                updater.UpdateTimer = updateTimer;
-                updater.UpdaterID = UUID.Random();
-                updater.Params = extraParams;
-                updater.BlendWithOldTexture = SetBlending;
-                updater.FrontAlpha = AlphaValue;
-                updater.Face = face;
-                updater.Url = "Local image";
-                updater.Disp = disp;
+                DynamicTextureUpdater updater = new DynamicTextureUpdater() { SimUUID = simID, 
+                                                                                PrimID = primID, 
+                                                                                ContentType = contentType, 
+                                                                                BodyData = data, 
+                                                                                UpdateTimer = updateTimer, 
+                                                                                UpdaterID = UUID.Random(), 
+                                                                                Params = extraParams, 
+                                                                                BlendWithOldTexture = SetBlending, 
+                                                                                FrontAlpha = AlphaValue, 
+                                                                                Face = face, 
+                                                                                Url = "Local image", 
+                                                                                Disp = disp };
 
                 lock (Updaters)
                 {
@@ -306,14 +309,10 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                 }
 
                 // Create a new asset for user
-                AssetBase asset
-                    = new AssetBase(
-                        UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture,
-                        scene.RegionInfo.RegionID.ToString());
-                asset.Data = assetData;
-                asset.Description = String.Format("URL image : {0}", Url);
-                asset.Local = false;
-                asset.Temporary = ((Disp & DISP_TEMP) != 0);
+                AssetBase asset = new AssetBase(UUID.Random(), "DynamicImage" + Util.RandomClass.Next(1, 10000), (sbyte)AssetType.Texture, scene.RegionInfo.RegionID.ToString()) { Data = assetData, 
+                                      Description = String.Format("URL image : {0}", Url), 
+                                      Local = false, 
+                                      Temporary = ((Disp & DISP_TEMP) != 0) };
                 scene.AssetService.Store(asset);
 
                 IJ2KDecoder cacheLayerDecode = scene.RequestModuleInterface<IJ2KDecoder>();
@@ -387,22 +386,19 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                         if (setNewAlpha)
                             SetAlpha(ref image1, newAlpha);
 
-                        Bitmap joint = MergeBitMaps(image1, image2);
-
-                        byte[] result = new byte[0];
-
-                        try
+                        using (Bitmap joint = MergeBitMaps(image1, image2))
                         {
-                            result = OpenJPEG.EncodeFromImage(joint, true);
+                            byte[] result = new byte[0];
+                            try
+                            {
+                                result = OpenJPEG.EncodeFromImage(joint, true);
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.ErrorFormat("[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed.  Exception {0}{1}", e.Message, e.StackTrace);
+                            }
+                            return result;
                         }
-                        catch (Exception e)
-                        {
-                            m_log.ErrorFormat(
-                                "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed.  Exception {0}{1}",
-                                e.Message, e.StackTrace);
-                        }
-
-                        return result;
                     }
                 }
 
@@ -411,14 +407,12 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 
             public Bitmap MergeBitMaps(Bitmap front, Bitmap back)
             {
-                Bitmap joint;
-                Graphics jG;
-
-                joint = new Bitmap(back.Width, back.Height, PixelFormat.Format32bppArgb);
-                jG = Graphics.FromImage(joint);
-
-                jG.DrawImage(back, 0, 0, back.Width, back.Height);
-                jG.DrawImage(front, 0, 0, back.Width, back.Height);
+                Bitmap joint = new Bitmap(back.Width, back.Height, PixelFormat.Format32bppArgb);
+                using (Graphics jG = Graphics.FromImage(joint))
+                {
+                    jG.DrawImage(back, 0, 0, back.Width, back.Height);
+                    jG.DrawImage(front, 0, 0, back.Width, back.Height);
+                }
 
                 return joint;
             }

OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs

@@ -173,6 +173,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return m_GridService.DeregisterRegion(regionID);
         }
 
+        public GridRegion GetEmptyCoordinates(UUID scopeID, int desiredX, int desiredY)
+        {
+            return m_GridService.GetEmptyCoordinates(scopeID, desiredX, desiredY);
+        }
+
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
             return m_GridService.GetNeighbours(scopeID, regionID); 
@@ -254,4 +259,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             MainConsole.Instance.Output(caps.ToString());
         }
     }
-}
+}

OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs

@@ -164,6 +164,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return false;
         }
 
+        public GridRegion GetEmptyCoordinates(UUID scopeID, int desiredX, int desiredY)
+        {
+            return m_RemoteGridService.GetEmptyCoordinates(scopeID, desiredX, desiredY);
+        }
+
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
             return m_RemoteGridService.GetNeighbours(scopeID, regionID);

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -813,10 +813,41 @@ namespace OpenSim.Region.Framework.Scenes
                     string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
                     UUID tileID;
 
+                    m_log.Info(String.Format("[SCENE]: MaptileStaticUUID for {0} config -> {1}", RegionInfo.RegionName, RegionInfo.RegionFile));
+
+                    IniConfigSource sourceRegion = new IniConfigSource(RegionInfo.RegionFile);
+
+                    if (sourceRegion.Configs[RegionInfo.RegionName] != null)
+                    {
+                        if (sourceRegion.Configs[RegionInfo.RegionName].Contains("MaptileStaticUUID"))
+                        {
+                            tile = sourceRegion.Configs[RegionInfo.RegionName].GetString("MaptileStaticUUID", UUID.Zero.ToString());
+                            m_log.Info("[SCENE]: MaptileStaticUUID " + tile);
+                        }
+                    }
+
                     if (UUID.TryParse(tile, out tileID))
                     {
                         RegionInfo.RegionSettings.TerrainImageID = tileID;
                     }
+                    else
+                    {
+                        tileID = UUID.Zero;
+                    }
+
+                    if (tileID == UUID.Zero)
+                    {
+                        m_generateMaptiles = true;
+
+                        int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
+                        if (maptileRefresh != 0)
+                        {
+                            m_mapGenerationTimer.Interval = maptileRefresh * 1000;
+                            m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister;
+                            m_mapGenerationTimer.AutoReset = true;
+                            m_mapGenerationTimer.Start();
+                        }
+                    }
                 }
 
                 string grant = startupConfig.GetString("AllowedClients", String.Empty);

OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs

@@ -30,7 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using Nini.Config;
-using log4net;
+using log4net;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.Physics.Manager

OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs

@@ -85,6 +85,9 @@ namespace OpenSim.Server.Handlers.Grid
                     case "deregister":
                         return Deregister(request);
 
+                    case "get_empty_coordinates":
+                        return GetEmptyCoordinates(request);
+
                     case "get_neighbours":
                         return GetNeighbours(request);
 
@@ -194,6 +197,41 @@ namespace OpenSim.Server.Handlers.Grid
 
         }
 
+        byte[] GetEmptyCoordinates(Dictionary<string, object> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request.ContainsKey("SCOPEID"))
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get empty coordinates");
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+
+            int desiredX = 7000; // put this at OpenSim.ini file
+            int desiredY = 7000; // this also
+
+            if (request.ContainsKey("X"))
+                int.TryParse( request["X"].ToString(), out desiredX);
+
+            if (request.ContainsKey("Y"))
+                int.TryParse(request["Y"].ToString(), out desiredY);
+
+            // TODO: Create the Method to get Empty Coordinates
+            GridRegion rinfo = m_GridService.GetEmptyCoordinates(scopeID, desiredX, desiredY);
+
+            if (rinfo == null)
+                result["coordinates"] = desiredX + "," + desiredY;
+            else
+            {
+                result["coordinates"] = rinfo.RegionCoordX.ToString() + "," + rinfo.RegionCoordY.ToString();
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+        }
+
         byte[] GetNeighbours(Dictionary<string, object> request)
         {
             UUID scopeID = UUID.Zero;

OpenSim/Services/Connectors/Grid/GridServicesConnector.cs

@@ -178,6 +178,15 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        public GridRegion GetEmptyCoordinates(UUID scopeID, int desiredX, int desiredY)
+        {
+            GridRegion rinfo = new GridRegion();
+
+            // TODO : Search empty spots on Grid to register a new SIM
+
+            return rinfo;
+        }
+
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();

OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs

@@ -154,6 +154,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return success;
         }
 
+        public GridRegion GetEmptyCoordinates(UUID scopeID, int desiredX, int desiredY)
+        {
+            GridRegion rinfo = new GridRegion();
+
+            // TODO : Search empty spots on Grid to register a new SIM
+
+            return rinfo;
+        }
+
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
             const int NEIGHBOR_RADIUS = 128;

OpenSim/Services/GridService/GridService.cs

@@ -301,6 +301,15 @@ namespace OpenSim.Services.GridService
             return m_Database.Delete(regionID);
         }
 
+        public GridRegion GetEmptyCoordinates(UUID scopeID, int desiredX, int desiredY)
+        {
+            GridRegion rinfo = new GridRegion();
+
+            // TODO : Search empty spots on Grid to register a new SIM
+
+            return rinfo;
+        }
+
         public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
         {
             List<GridRegion> rinfos = new List<GridRegion>();

OpenSim/Services/Interfaces/IGridService.cs

@@ -52,6 +52,12 @@ namespace OpenSim.Services.Interfaces
         /// <exception cref="System.Exception">Thrown if region deregistration failed</exception>
         bool DeregisterRegion(UUID regionID);
 
+        /// <summary>
+        /// Get information about the empty spot to register a new Simulator.
+        /// </summary>
+        /// <returns></returns>
+        GridRegion GetEmptyCoordinates(UUID scopeID, int desiredX, int desiredY);
+
         /// <summary>
         /// Get information about the regions neighbouring the given co-ordinates (in meters).
         /// </summary>
@@ -60,6 +66,7 @@ namespace OpenSim.Services.Interfaces
         /// <returns></returns>
         List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID);
 
+
         GridRegion GetRegionByUUID(UUID scopeID, UUID regionID);
 
         /// <summary>

bin/lib32/libsqlite3.txt

@@ -1 +0,0 @@
-libsqlite version: 3.7.5

prebuild.xml

@@ -2084,6 +2084,44 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="System.Xml"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="MySql.Data" path="../../../bin/"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="Mono.Addins" path="../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests"/>
+        </Match>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.sql"/>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
+      </Files>
+    </Project>
+
     <Project frameworkVersion="v3_5" name="OpenSim.Data.MSSQL" path="OpenSim/Data/MSSQL" type="Library">
       <Configuration name="Debug">
         <Options>

syncneb.bat

@@ -0,0 +1,6 @@
+rem git remote add upstream git://github.com/nebadon2025/opensimulator.git
+
+git fetch upstream
+
+git merge upstream/master
+