GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.

BTW, the Meshing files want to be committed too -- EOFs.

1 files changed, 176 insertions, 176 deletions

diff --git a/OpenSim/Region/Physics/Meshing/SculptMap.cs b/OpenSim/Region/Physics/Meshing/SculptMap.cs
index 4906cf6..d2d71de 100644
--- a/OpenSim/Region/Physics/Meshing/SculptMap.cs
+++ b/OpenSim/Region/Physics/Meshing/SculptMap.cs
@@ -1,176 +1,176 @@
-/*

- * Copyright (c) Contributors

- * 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 OpenSimulator 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.

- */

-

-// to build without references to System.Drawing, comment this out

-#define SYSTEM_DRAWING

-

-using System;

-using System.Collections.Generic;

-using System.Text;

-

-#if SYSTEM_DRAWING

-using System.Drawing;

-using System.Drawing.Imaging;

-

-namespace PrimMesher

-{

-    public class SculptMap

-    {

-        public int width;

-        public int height;

-        public byte[] redBytes;

-        public byte[] greenBytes;

-        public byte[] blueBytes;

-

-        public SculptMap()

-        {

-        }

-

-        public SculptMap(Bitmap bm, int lod)

-        {

-            int bmW = bm.Width;

-            int bmH = bm.Height;

-

-            if (bmW == 0 || bmH == 0)

-                throw new Exception("SculptMap: bitmap has no data");

-

-            int numLodPixels = lod * 2 * lod * 2;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image

-

-            bool needsScaling = false;

-

-            width = bmW;

-            height = bmH;

-            while (width * height > numLodPixels)

-            {

-                width >>= 1;

-                height >>= 1;

-                needsScaling = true;

-            }

-

-

-

-            try

-            {

-                if (needsScaling)

-                    bm = ScaleImage(bm, width, height,

-                        System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor);

-            }

-

-            catch (Exception e)

-            {

-                throw new Exception("Exception in ScaleImage(): e: " + e.ToString());

-            }

-

-            if (width * height > lod * lod)

-            {

-                width >>= 1;

-                height >>= 1;

-            }

-

-            int numBytes = (width + 1) * (height + 1);

-            redBytes = new byte[numBytes];

-            greenBytes = new byte[numBytes];

-            blueBytes = new byte[numBytes];

-

-            int byteNdx = 0;

-

-            try

-            {

-                for (int y = 0; y <= height; y++)

-                {

-                    for (int x = 0; x <= width; x++)

-                    {

-                        int bmY = y < height ? y * 2 : y * 2 - 1;

-                        int bmX = x < width ? x * 2 : x * 2 - 1;

-                        Color c = bm.GetPixel(bmX, bmY);

-

-                        redBytes[byteNdx] = c.R;

-                        greenBytes[byteNdx] = c.G;

-                        blueBytes[byteNdx] = c.B;

-

-                        ++byteNdx;

-                    }

-                }

-            }

-            catch (Exception e)

-            {

-                throw new Exception("Caught exception processing byte arrays in SculptMap(): e: " + e.ToString());

-            }

-

-            width++;

-            height++;

-        }

-

-        public List<List<Coord>> ToRows(bool mirror)

-        {

-            int numRows = height;

-            int numCols = width;

-

-            List<List<Coord>> rows = new List<List<Coord>>(numRows);

-

-            float pixScale = 1.0f / 255;

-

-            int rowNdx, colNdx;

-            int smNdx = 0;

-

-            for (rowNdx = 0; rowNdx < numRows; rowNdx++)

-            {

-                List<Coord> row = new List<Coord>(numCols);

-                for (colNdx = 0; colNdx < numCols; colNdx++)

-                {

-                    if (mirror)

-                        row.Add(new Coord(-(redBytes[smNdx] * pixScale - 0.5f), (greenBytes[smNdx] * pixScale - 0.5f), blueBytes[smNdx] * pixScale - 0.5f));

-                    else

-                        row.Add(new Coord(redBytes[smNdx] * pixScale - 0.5f, greenBytes[smNdx] * pixScale - 0.5f, blueBytes[smNdx] * pixScale - 0.5f));

-

-                    ++smNdx;

-                }

-                rows.Add(row);

-            }

-            return rows;

-        }

-

-        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight,

-                System.Drawing.Drawing2D.InterpolationMode interpMode)

-        {

-            Bitmap scaledImage = new Bitmap(srcImage, destWidth, destHeight);

-            scaledImage.SetResolution(96.0f, 96.0f);

-

-            Graphics grPhoto = Graphics.FromImage(scaledImage);

-            grPhoto.InterpolationMode = interpMode;

-

-            grPhoto.DrawImage(srcImage,

-                new Rectangle(0, 0, destWidth, destHeight),

-                new Rectangle(0, 0, srcImage.Width, srcImage.Height),

-                GraphicsUnit.Pixel);

-

-            grPhoto.Dispose();

-            return scaledImage;

-        }

-    }

-}

-#endif

+/*
+ * Copyright (c) Contributors
+ * 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 OpenSimulator 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.
+ */
+
+// to build without references to System.Drawing, comment this out
+#define SYSTEM_DRAWING
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#if SYSTEM_DRAWING
+using System.Drawing;
+using System.Drawing.Imaging;
+
+namespace PrimMesher
+{
+    public class SculptMap
+    {
+        public int width;
+        public int height;
+        public byte[] redBytes;
+        public byte[] greenBytes;
+        public byte[] blueBytes;
+
+        public SculptMap()
+        {
+        }
+
+        public SculptMap(Bitmap bm, int lod)
+        {
+            int bmW = bm.Width;
+            int bmH = bm.Height;
+
+            if (bmW == 0 || bmH == 0)
+                throw new Exception("SculptMap: bitmap has no data");
+
+            int numLodPixels = lod * 2 * lod * 2;  // (32 * 2)^2  = 64^2 pixels for default sculpt map image
+
+            bool needsScaling = false;
+
+            width = bmW;
+            height = bmH;
+            while (width * height > numLodPixels)
+            {
+                width >>= 1;
+                height >>= 1;
+                needsScaling = true;
+            }
+
+
+
+            try
+            {
+                if (needsScaling)
+                    bm = ScaleImage(bm, width, height,
+                        System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor);
+            }
+
+            catch (Exception e)
+            {
+                throw new Exception("Exception in ScaleImage(): e: " + e.ToString());
+            }
+
+            if (width * height > lod * lod)
+            {
+                width >>= 1;
+                height >>= 1;
+            }
+
+            int numBytes = (width + 1) * (height + 1);
+            redBytes = new byte[numBytes];
+            greenBytes = new byte[numBytes];
+            blueBytes = new byte[numBytes];
+
+            int byteNdx = 0;
+
+            try
+            {
+                for (int y = 0; y <= height; y++)
+                {
+                    for (int x = 0; x <= width; x++)
+                    {
+                        int bmY = y < height ? y * 2 : y * 2 - 1;
+                        int bmX = x < width ? x * 2 : x * 2 - 1;
+                        Color c = bm.GetPixel(bmX, bmY);
+
+                        redBytes[byteNdx] = c.R;
+                        greenBytes[byteNdx] = c.G;
+                        blueBytes[byteNdx] = c.B;
+
+                        ++byteNdx;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                throw new Exception("Caught exception processing byte arrays in SculptMap(): e: " + e.ToString());
+            }
+
+            width++;
+            height++;
+        }
+
+        public List<List<Coord>> ToRows(bool mirror)
+        {
+            int numRows = height;
+            int numCols = width;
+
+            List<List<Coord>> rows = new List<List<Coord>>(numRows);
+
+            float pixScale = 1.0f / 255;
+
+            int rowNdx, colNdx;
+            int smNdx = 0;
+
+            for (rowNdx = 0; rowNdx < numRows; rowNdx++)
+            {
+                List<Coord> row = new List<Coord>(numCols);
+                for (colNdx = 0; colNdx < numCols; colNdx++)
+                {
+                    if (mirror)
+                        row.Add(new Coord(-(redBytes[smNdx] * pixScale - 0.5f), (greenBytes[smNdx] * pixScale - 0.5f), blueBytes[smNdx] * pixScale - 0.5f));
+                    else
+                        row.Add(new Coord(redBytes[smNdx] * pixScale - 0.5f, greenBytes[smNdx] * pixScale - 0.5f, blueBytes[smNdx] * pixScale - 0.5f));
+
+                    ++smNdx;
+                }
+                rows.Add(row);
+            }
+            return rows;
+        }
+
+        private Bitmap ScaleImage(Bitmap srcImage, int destWidth, int destHeight,
+                System.Drawing.Drawing2D.InterpolationMode interpMode)
+        {
+            Bitmap scaledImage = new Bitmap(srcImage, destWidth, destHeight);
+            scaledImage.SetResolution(96.0f, 96.0f);
+
+            Graphics grPhoto = Graphics.FromImage(scaledImage);
+            grPhoto.InterpolationMode = interpMode;
+
+            grPhoto.DrawImage(srcImage,
+                new Rectangle(0, 0, destWidth, destHeight),
+                new Rectangle(0, 0, srcImage.Width, srcImage.Height),
+                GraphicsUnit.Pixel);
+
+            grPhoto.Dispose();
+            return scaledImage;
+        }
+    }
+}
+#endif