ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties, clean up formatting, refactor out duplicate hard-coded port numbers.

Browse Source
This commit is contained in:
Jeff Ames
2008-06-13 00:21:53 +00:00
parent 1451d6fb9a
commit 64f01ade04
11 changed files with 74 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
View File

@@ -193,8 +193,8 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="xmlData"></param>
protected static void CreatePrimFromXml2(Scene scene, string xmlData)
{
SceneObjectGroup obj = new SceneObjectGroup(xmlData);
SceneObjectGroup obj = new SceneObjectGroup(xmlData);
LLVector3 receivedVelocity = obj.RootPart.Velocity;
//System.Console.WriteLine(obj.RootPart.Velocity.ToString());
scene.AddSceneObjectFromStorage(obj);

6
OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
View File

@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
{
bool lookup = false;
lock(cachedMapBlocks)
lock (cachedMapBlocks)
{
if (cachedMapBlocks.Count > 0 && ((cachedTime + 1800) > Util.UnixTimeSinceEpoch()))
{
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
mapBlocks = m_scene.CommsManager.GridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8);
avatarPresence.ControllingClient.SendMapBlock(mapBlocks);
lock(cachedMapBlocks)
lock (cachedMapBlocks)
cachedMapBlocks = mapBlocks;
cachedTime = Util.UnixTimeSinceEpoch();
@@ -236,4 +236,4 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
remoteClient.SendMapBlock(mapBlocks);
}
}
}
}