diff options
author | Jeff Ames | 2009-03-10 00:03:26 +0000 |
---|---|---|
committer | Jeff Ames | 2009-03-10 00:03:26 +0000 |
commit | 112a1af3a68d355724e09399372c71c2ae452cb4 (patch) | |
tree | ba9f8102dcdce7c5686afd553c7e78647f330108 /OpenSim | |
parent | Thanks M1sha for a patch to reinstate the original functionality of the TreeP... (diff) | |
download | opensim-SC_OLD-112a1af3a68d355724e09399372c71c2ae452cb4.zip opensim-SC_OLD-112a1af3a68d355724e09399372c71c2ae452cb4.tar.gz opensim-SC_OLD-112a1af3a68d355724e09399372c71c2ae452cb4.tar.bz2 opensim-SC_OLD-112a1af3a68d355724e09399372c71c2ae452cb4.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 6b8c09f..5ca85f1 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -251,7 +251,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
251 | 251 | ||
252 | if (avatarExt.Body != null) | 252 | if (avatarExt.Body != null) |
253 | { | 253 | { |
254 | foreach(OmBipedBoneOrientation boneOrientation in avatarExt.Body.BipedBoneOrientations) | 254 | foreach (OmBipedBoneOrientation boneOrientation in avatarExt.Body.BipedBoneOrientations) |
255 | { | 255 | { |
256 | if (boneOrientation.Bone == OmBipedBones.Head) | 256 | if (boneOrientation.Bone == OmBipedBones.Head) |
257 | { | 257 | { |
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index 203ab32..26b6b98 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | |||
@@ -26,7 +26,6 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | |||
30 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
31 | using System.Reflection; | 30 | using System.Reflection; |
32 | using log4net; | 31 | using log4net; |
@@ -63,16 +62,13 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
63 | this, "export-map", | 62 | this, "export-map", |
64 | "export-map [<path>]", | 63 | "export-map [<path>]", |
65 | "Save an image of the world map", HandleExportWorldMapConsoleCommand); | 64 | "Save an image of the world map", HandleExportWorldMapConsoleCommand); |
66 | |||
67 | } | 65 | } |
68 | 66 | ||
69 | |||
70 | public override string Name | 67 | public override string Name |
71 | { | 68 | { |
72 | get { return "HGWorldMap"; } | 69 | get { return "HGWorldMap"; } |
73 | } | 70 | } |
74 | 71 | ||
75 | |||
76 | #endregion | 72 | #endregion |
77 | 73 | ||
78 | /// <summary> | 74 | /// <summary> |
@@ -143,10 +139,10 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
143 | } | 139 | } |
144 | } | 140 | } |
145 | 141 | ||
146 | |||
147 | private void FillInMap(List<MapBlockData> mapBlocks, int minX, int minY, int maxX, int maxY) | 142 | private void FillInMap(List<MapBlockData> mapBlocks, int minX, int minY, int maxX, int maxY) |
148 | { | 143 | { |
149 | for (int x = minX; x <= maxX; x++) | 144 | for (int x = minX; x <= maxX; x++) |
145 | { | ||
150 | for (int y = minY; y <= maxY; y++) | 146 | for (int y = minY; y <= maxY; y++) |
151 | { | 147 | { |
152 | MapBlockData mblock = mapBlocks.Find(delegate(MapBlockData mb) { return ((mb.X == x) && (mb.Y == y)); }); | 148 | MapBlockData mblock = mapBlocks.Find(delegate(MapBlockData mb) { return ((mb.X == x) && (mb.Y == y)); }); |
@@ -161,6 +157,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
161 | mapBlocks.Add(mblock); | 157 | mapBlocks.Add(mblock); |
162 | } | 158 | } |
163 | } | 159 | } |
160 | } | ||
164 | } | 161 | } |
165 | } | 162 | } |
166 | } | 163 | } |