aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-05-03 01:31:32 +0100
committerMelanie2010-05-03 01:31:32 +0100
commit75063e8f60d2c08399e83cb105ee575845442f77 (patch)
treef885dabc90c8d2a15709efa3c59fac077060ce23
parentMake in-place sale send CHANGED_OWNER again (diff)
parent* Another one of those super useful commit tests (diff)
downloadopensim-SC-75063e8f60d2c08399e83cb105ee575845442f77.zip
opensim-SC-75063e8f60d2c08399e83cb105ee575845442f77.tar.gz
opensim-SC-75063e8f60d2c08399e83cb105ee575845442f77.tar.bz2
opensim-SC-75063e8f60d2c08399e83cb105ee575845442f77.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs2
-rw-r--r--README.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 56b50dc..a1a4f9e 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
135 data.Y = 0; 135 data.Y = 0;
136 blocks.Add(data); 136 blocks.Add(data);
137 137
138 remoteClient.SendMapBlock(blocks, 0); 138 remoteClient.SendMapBlock(blocks, 2);
139 } 139 }
140 140
141 private Scene GetClientScene(IClientAPI client) 141 private Scene GetClientScene(IClientAPI client)
diff --git a/README.txt b/README.txt
index 2bf28ce..f1a71be 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
1Welcome to OpenSim! 1Welcome to OpenSim!
2 2
3=== OVERVIEW === 3== OVERVIEW ==
4 4
5OpenSim is a BSD Licensed Open Source project to develop a functioning 5OpenSim is a BSD Licensed Open Source project to develop a functioning
6virtual worlds server platform capable of supporting multiple clients 6virtual worlds server platform capable of supporting multiple clients