diff options
author | Jeff Ames | 2008-08-15 10:24:04 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-15 10:24:04 +0000 |
commit | dde21314e75acdaeff27af70077f283493401961 (patch) | |
tree | 490ab065895adb41ee4771fce623f99faa60b507 /OpenSim/Region/Communications | |
parent | Fixes a case where, when inventory is not currently accessible due (diff) | |
download | opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.zip opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.gz opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.bz2 opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.xz |
Update svn properties, formatting cleanup, fix a couple compiler warnings.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 14 |
2 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index a608da0..5cf62f3 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -175,9 +175,10 @@ namespace OpenSim.Region.Communications.Local | |||
175 | public RegionInfo RequestNeighbourInfo(LLUUID regionID) | 175 | public RegionInfo RequestNeighbourInfo(LLUUID regionID) |
176 | { | 176 | { |
177 | // TODO add a dictionary for faster lookup | 177 | // TODO add a dictionary for faster lookup |
178 | foreach(RegionInfo info in m_regions.Values) | 178 | foreach (RegionInfo info in m_regions.Values) |
179 | { | 179 | { |
180 | if(info.RegionID == regionID) return info; | 180 | if (info.RegionID == regionID) |
181 | return info; | ||
181 | } | 182 | } |
182 | return null; | 183 | return null; |
183 | } | 184 | } |
@@ -186,7 +187,8 @@ namespace OpenSim.Region.Communications.Local | |||
186 | { | 187 | { |
187 | foreach (RegionInfo regInfo in m_regions.Values) | 188 | foreach (RegionInfo regInfo in m_regions.Values) |
188 | { | 189 | { |
189 | if (regInfo.RegionName == regionName) return regInfo; | 190 | if (regInfo.RegionName == regionName) |
191 | return regInfo; | ||
190 | } | 192 | } |
191 | return null; | 193 | return null; |
192 | } | 194 | } |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index ee5c7bb..01b1933 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -75,8 +75,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
75 | userData.Image = new LLUUID((string) data["profile_image"]); | 75 | userData.Image = new LLUUID((string) data["profile_image"]); |
76 | userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); | 76 | userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); |
77 | userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); | 77 | userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); |
78 | if(data.Contains("home_region_id")) userData.HomeRegionID = new LLUUID((string)data["home_region_id"]); | 78 | if (data.Contains("home_region_id")) |
79 | else userData.HomeRegionID = LLUUID.Zero; | 79 | userData.HomeRegionID = new LLUUID((string)data["home_region_id"]); |
80 | else | ||
81 | userData.HomeRegionID = LLUUID.Zero; | ||
80 | userData.HomeLocation = | 82 | userData.HomeLocation = |
81 | new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), | 83 | new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), |
82 | (float) Convert.ToDecimal((string) data["home_coordinates_y"]), | 84 | (float) Convert.ToDecimal((string) data["home_coordinates_y"]), |
@@ -85,10 +87,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
85 | new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]), | 87 | new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]), |
86 | (float) Convert.ToDecimal((string) data["home_look_y"]), | 88 | (float) Convert.ToDecimal((string) data["home_look_y"]), |
87 | (float) Convert.ToDecimal((string) data["home_look_z"])); | 89 | (float) Convert.ToDecimal((string) data["home_look_z"])); |
88 | if(data.Contains("user_flags")) | 90 | if (data.Contains("user_flags")) |
89 | userData.UserFlags = Convert.ToInt32((string) data["user_flags"]); | 91 | userData.UserFlags = Convert.ToInt32((string) data["user_flags"]); |
90 | if(data.Contains("god_level")) | 92 | if (data.Contains("god_level")) |
91 | userData.GodLevel = Convert.ToInt32((string) data["god_level"]); | 93 | userData.GodLevel = Convert.ToInt32((string) data["god_level"]); |
92 | 94 | ||
93 | return userData; | 95 | return userData; |
94 | } | 96 | } |