From 98705e621112d517c63c6f937e1f398e69ad3425 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 13 May 2007 12:48:42 +0000
Subject: Changed to slightly better textures for the map: a blue one for the
 sea and one that if you stand at least 10 feet away from the screen and
 strain your eyes a bit and have really bad vision could maybe look like a
 island.

---
 OpenSim.GridInterfaces/Local/LocalAssetServer.cs  |  22 ++++++++++++++++++++++
 OpenSim.RegionServer/SimClient.cs                 |   2 +-
 OpenSim.RegionServer/world/WorldPacketHandlers.cs |   2 +-
 bin/assets/map1.jp2                               | Bin 0 -> 570 bytes
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 bin/assets/map1.jp2

diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 5c98377..5f75821 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -210,6 +210,28 @@ namespace OpenSim.GridInterfaces.Local
                 db.Commit();
 
                 Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");
+                Image.Name = "Map Base Texture";
+                this.LoadAsset(Image, true, "map_base.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
+                Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");
+                Image.Name = "Map Texture";
+                this.LoadAsset(Image, true, "map1.jp2");
+                store = new AssetStorage();
+                store.Data = Image.Data;
+                store.Name = Image.Name;
+                store.UUID = Image.FullID;
+                db.Set(store);
+                db.Commit();
+
+                Image = new AssetBase();
                 Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
                 Image.Name = "Shape";
                 this.LoadAsset(Image, false, "base_shape.dat");
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index ab13b02..acc873d 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -1136,7 +1136,7 @@ namespace OpenSim
             mapReply.LayerData[0].Left = 800;
             mapReply.LayerData[0].Top = 1200;
             mapReply.LayerData[0].Right = 1200;
-            mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000001");
+            mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
             this.OutPacket(mapReply);
         }
 
diff --git a/OpenSim.RegionServer/world/WorldPacketHandlers.cs b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
index d479c85..2036bc6 100644
--- a/OpenSim.RegionServer/world/WorldPacketHandlers.cs
+++ b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
@@ -213,7 +213,7 @@ namespace OpenSim.world
                 mapReply.AgentData.Flags = 0;
                 mapReply.Data = new MapBlockReplyPacket.DataBlock[1];
                 mapReply.Data[0] = new MapBlockReplyPacket.DataBlock();
-                mapReply.Data[0].MapImageID = new LLUUID("00000000-0000-0000-9999-000000000002");
+                mapReply.Data[0].MapImageID = new LLUUID("00000000-0000-0000-9999-000000000007");
                 mapReply.Data[0].X = (ushort)m_regInfo.RegionLocX;
                 mapReply.Data[0].Y = (ushort)m_regInfo.RegionLocY;
                 mapReply.Data[0].WaterHeight =(byte) m_regInfo.RegionWaterHeight;
diff --git a/bin/assets/map1.jp2 b/bin/assets/map1.jp2
new file mode 100644
index 0000000..cd2fd94
Binary files /dev/null and b/bin/assets/map1.jp2 differ
-- 
cgit v1.1