aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-05-13 12:48:42 +0000
committerMW2007-05-13 12:48:42 +0000
commit98705e621112d517c63c6f937e1f398e69ad3425 (patch)
tree0caada8484dced975195a887ccf84c0e787a5212
parentAdded very basic support for maps (likely to only work in sandbox mode due to... (diff)
downloadopensim-SC_OLD-98705e621112d517c63c6f937e1f398e69ad3425.zip
opensim-SC_OLD-98705e621112d517c63c6f937e1f398e69ad3425.tar.gz
opensim-SC_OLD-98705e621112d517c63c6f937e1f398e69ad3425.tar.bz2
opensim-SC_OLD-98705e621112d517c63c6f937e1f398e69ad3425.tar.xz
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.
Diffstat (limited to '')
-rw-r--r--OpenSim.GridInterfaces/Local/LocalAssetServer.cs22
-rw-r--r--OpenSim.RegionServer/SimClient.cs2
-rw-r--r--OpenSim.RegionServer/world/WorldPacketHandlers.cs2
-rw-r--r--bin/assets/map1.jp2bin0 -> 570 bytes
4 files changed, 24 insertions, 2 deletions
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
210 db.Commit(); 210 db.Commit();
211 211
212 Image = new AssetBase(); 212 Image = new AssetBase();
213 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000006");
214 Image.Name = "Map Base Texture";
215 this.LoadAsset(Image, true, "map_base.jp2");
216 store = new AssetStorage();
217 store.Data = Image.Data;
218 store.Name = Image.Name;
219 store.UUID = Image.FullID;
220 db.Set(store);
221 db.Commit();
222
223 Image = new AssetBase();
224 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000007");
225 Image.Name = "Map Texture";
226 this.LoadAsset(Image, true, "map1.jp2");
227 store = new AssetStorage();
228 store.Data = Image.Data;
229 store.Name = Image.Name;
230 store.UUID = Image.FullID;
231 db.Set(store);
232 db.Commit();
233
234 Image = new AssetBase();
213 Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); 235 Image.FullID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
214 Image.Name = "Shape"; 236 Image.Name = "Shape";
215 this.LoadAsset(Image, false, "base_shape.dat"); 237 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
1136 mapReply.LayerData[0].Left = 800; 1136 mapReply.LayerData[0].Left = 800;
1137 mapReply.LayerData[0].Top = 1200; 1137 mapReply.LayerData[0].Top = 1200;
1138 mapReply.LayerData[0].Right = 1200; 1138 mapReply.LayerData[0].Right = 1200;
1139 mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000001"); 1139 mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
1140 this.OutPacket(mapReply); 1140 this.OutPacket(mapReply);
1141 } 1141 }
1142 1142
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
213 mapReply.AgentData.Flags = 0; 213 mapReply.AgentData.Flags = 0;
214 mapReply.Data = new MapBlockReplyPacket.DataBlock[1]; 214 mapReply.Data = new MapBlockReplyPacket.DataBlock[1];
215 mapReply.Data[0] = new MapBlockReplyPacket.DataBlock(); 215 mapReply.Data[0] = new MapBlockReplyPacket.DataBlock();
216 mapReply.Data[0].MapImageID = new LLUUID("00000000-0000-0000-9999-000000000002"); 216 mapReply.Data[0].MapImageID = new LLUUID("00000000-0000-0000-9999-000000000007");
217 mapReply.Data[0].X = (ushort)m_regInfo.RegionLocX; 217 mapReply.Data[0].X = (ushort)m_regInfo.RegionLocX;
218 mapReply.Data[0].Y = (ushort)m_regInfo.RegionLocY; 218 mapReply.Data[0].Y = (ushort)m_regInfo.RegionLocY;
219 mapReply.Data[0].WaterHeight =(byte) m_regInfo.RegionWaterHeight; 219 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
--- /dev/null
+++ b/bin/assets/map1.jp2
Binary files differ