From 98705e621112d517c63c6f937e1f398e69ad3425 Mon Sep 17 00:00:00 2001
From: MW <Michaelwri22@yahoo.co.uk>
Date: Sun, 13 May 2007 12:48:42 +0000
Subject: [PATCH] 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.

---
 .../Local/LocalAssetServer.cs                 |  22 ++++++++++++++++++
 OpenSim.RegionServer/SimClient.cs             |   2 +-
 .../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 5c98377575..5f75821efe 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -209,6 +209,28 @@ namespace OpenSim.GridInterfaces.Local
                 db.Set(store);
                 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";
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index ab13b02938..acc873d248 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 d479c85b04..2036bc66b8 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 0000000000000000000000000000000000000000..cd2fd94422cdb60b744e5055749e622aca936060
GIT binary patch
literal 570
zcmezG|38pHp8*6Mpcupk0S71su^AYc*%=uj=zkCc4^V)Sk&T6gf$@I~1FItg!~Y2k
zTp(qPAAmyW3d9^7JUjx>(ErKjmnd*d{=eq%10J^jYYy}<{$F$Okoz$q{vHJe`TuKJ
z>i@4{wg-xRZ0TR3B5&Zp2^3(r{=bH!`u~~*1qn<*oiF+Mm)OXA6mW~qW7Gb>h9~&U
zF`y3K*JXjsP+1e8EDwv=10bI}P3<dC&5>EJfod9#-%yoLm?Q70pv>**yzQNDC>QJX
zi$NSS&Hk^ED(&Aj$!nL<BQM{gu-wYq`+;`;nPi}$$-Usw-a?U;k}miEuQ`508K_^F
zLHY1(>!!EzGuFjUQQ8<7@qdlvX1>YG<<j~ku4x6`t~tS{`+p6aPnTNG#D>FX51%<W
zL-I<e$tHpQSFi6_T$#x5ox?Co_^0V>gDVp^$4E<Um-^&#+;Bo@yRgBJDvmOZWYLa0
ze;%bs`sw{Qa+2&V&{?8%XpyKuNCVS<j@i9x$E&1|?UZ^JcZXGUo1(-N<Nt0C8xGsa
zW^o<J*>f}IV)wQc7w^8hmB4DOXIGN&{z>oJs%bi^_gj<Ztt$}DSL$9eL)jqR)!+Nb
zgS+pWOds$cHj_M%dwczX>X=8?H-smddz(nx$|k&hYsh+2V9z)6hC>CH=Iok3rQ}gV
H!~dHAp6clh

literal 0
HcmV?d00001