aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2011-05-09 18:37:35 +0100
committerMelanie2011-05-09 18:37:35 +0100
commit1bd949614a927f32b7194ecefaeb74fdd46cab4f (patch)
tree8974bd63062468b776c2a8de31d3de5a8ff3ea69 /OpenSim/Region/ClientStack/Linden
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentFixes gray tiles on map search for viewers 1. (diff)
downloadopensim-SC-1bd949614a927f32b7194ecefaeb74fdd46cab4f.zip
opensim-SC-1bd949614a927f32b7194ecefaeb74fdd46cab4f.tar.gz
opensim-SC-1bd949614a927f32b7194ecefaeb74fdd46cab4f.tar.bz2
opensim-SC-1bd949614a927f32b7194ecefaeb74fdd46cab4f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 0eafc69..de40abd 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1370,7 +1370,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1370 1370
1371 public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag) 1371 public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
1372 { 1372 {
1373
1374 MapBlockData[] mapBlocks2 = mapBlocks.ToArray(); 1373 MapBlockData[] mapBlocks2 = mapBlocks.ToArray();
1375 1374
1376 int maxsend = 10; 1375 int maxsend = 10;
@@ -8320,13 +8319,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
8320 return true; 8319 return true;
8321 } 8320 }
8322 #endregion 8321 #endregion
8323
8324 string mapName = Util.UTF8.GetString(map.NameData.Name, 0, 8322 string mapName = Util.UTF8.GetString(map.NameData.Name, 0,
8325 map.NameData.Name.Length - 1); 8323 map.NameData.Name.Length - 1);
8326 RequestMapName handlerMapNameRequest = OnMapNameRequest; 8324 RequestMapName handlerMapNameRequest = OnMapNameRequest;
8327 if (handlerMapNameRequest != null) 8325 if (handlerMapNameRequest != null)
8328 { 8326 {
8329 handlerMapNameRequest(this, mapName); 8327 handlerMapNameRequest(this, mapName, map.AgentData.Flags);
8330 } 8328 }
8331 return true; 8329 return true;
8332 } 8330 }