diff options
author | David Walter Seikel | 2016-11-07 12:44:56 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-07 12:44:56 +1000 |
commit | 15dd750b32cb7ae50d3f5dd58e2fc1f9542a4d2f (patch) | |
tree | f76174f0838c22eeb31f7f9e4d0d53502b8504f1 /OpenSim | |
parent | Sims are 16 km high now, about the maximum before prim jitter starts getting ... (diff) | |
download | opensim-SC-15dd750b32cb7ae50d3f5dd58e2fc1f9542a4d2f.zip opensim-SC-15dd750b32cb7ae50d3f5dd58e2fc1f9542a4d2f.tar.gz opensim-SC-15dd750b32cb7ae50d3f5dd58e2fc1f9542a4d2f.tar.bz2 opensim-SC-15dd750b32cb7ae50d3f5dd58e2fc1f9542a4d2f.tar.xz |
Excess white space removal.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 18 | ||||
-rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 2588d51..846c8db 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1676,7 +1676,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1676 | } | 1676 | } |
1677 | return result; | 1677 | return result; |
1678 | } | 1678 | } |
1679 | 1679 | ||
1680 | private ArrayList osdToArray(OSDArray list) | 1680 | private ArrayList osdToArray(OSDArray list) |
1681 | { | 1681 | { |
1682 | ArrayList result = new ArrayList(); | 1682 | ArrayList result = new ArrayList(); |
@@ -1730,7 +1730,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1730 | m_host.AddScriptLPS(1); | 1730 | m_host.AddScriptLPS(1); |
1731 | 1731 | ||
1732 | Object decoded = osParseJSONNew(JSON); | 1732 | Object decoded = osParseJSONNew(JSON); |
1733 | 1733 | ||
1734 | if ( decoded is Hashtable ) { | 1734 | if ( decoded is Hashtable ) { |
1735 | return (Hashtable) decoded; | 1735 | return (Hashtable) decoded; |
1736 | } else if ( decoded is ArrayList ) { | 1736 | } else if ( decoded is ArrayList ) { |
@@ -3084,7 +3084,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3084 | bool isMale = vpShapeMale > 0.5f; | 3084 | bool isMale = vpShapeMale > 0.5f; |
3085 | return new LSL_String(isMale ? "male" : "female"); | 3085 | return new LSL_String(isMale ? "male" : "female"); |
3086 | } | 3086 | } |
3087 | 3087 | ||
3088 | /// <summary> | 3088 | /// <summary> |
3089 | /// Get current region's map texture UUID | 3089 | /// Get current region's map texture UUID |
3090 | /// </summary> | 3090 | /// </summary> |
@@ -3123,7 +3123,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3123 | 3123 | ||
3124 | return key.ToString(); | 3124 | return key.ToString(); |
3125 | } | 3125 | } |
3126 | 3126 | ||
3127 | /// <summary> | 3127 | /// <summary> |
3128 | /// Return information regarding various simulator statistics (sim fps, physics fps, time | 3128 | /// Return information regarding various simulator statistics (sim fps, physics fps, time |
3129 | /// dilation, total number of prims, total number of active scripts, script lps, various | 3129 | /// dilation, total number of prims, total number of active scripts, script lps, various |
@@ -3137,7 +3137,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3137 | m_host.AddScriptLPS(1); | 3137 | m_host.AddScriptLPS(1); |
3138 | LSL_List ret = new LSL_List(); | 3138 | LSL_List ret = new LSL_List(); |
3139 | float[] stats = World.StatsReporter.LastReportedSimStats; | 3139 | float[] stats = World.StatsReporter.LastReportedSimStats; |
3140 | 3140 | ||
3141 | for (int i = 0; i < 21; i++) | 3141 | for (int i = 0; i < 21; i++) |
3142 | { | 3142 | { |
3143 | ret.Add(new LSL_Float(stats[i])); | 3143 | ret.Add(new LSL_Float(stats[i])); |
@@ -3183,7 +3183,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3183 | 3183 | ||
3184 | return (int)pws; | 3184 | return (int)pws; |
3185 | } | 3185 | } |
3186 | 3186 | ||
3187 | public void osSetSpeed(string UUID, LSL_Float SpeedModifier) | 3187 | public void osSetSpeed(string UUID, LSL_Float SpeedModifier) |
3188 | { | 3188 | { |
3189 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); | 3189 | CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed"); |
@@ -3193,7 +3193,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3193 | if (avatar != null) | 3193 | if (avatar != null) |
3194 | avatar.SpeedModifier = (float)SpeedModifier; | 3194 | avatar.SpeedModifier = (float)SpeedModifier; |
3195 | } | 3195 | } |
3196 | 3196 | ||
3197 | public void osKickAvatar(string FirstName, string SurName, string alert) | 3197 | public void osKickAvatar(string FirstName, string SurName, string alert) |
3198 | { | 3198 | { |
3199 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); | 3199 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); |
@@ -3223,7 +3223,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3223 | if (presence != null) health = presence.Health; | 3223 | if (presence != null) health = presence.Health; |
3224 | return health; | 3224 | return health; |
3225 | } | 3225 | } |
3226 | 3226 | ||
3227 | public void osCauseDamage(string avatar, double damage) | 3227 | public void osCauseDamage(string avatar, double damage) |
3228 | { | 3228 | { |
3229 | CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); | 3229 | CheckThreatLevel(ThreatLevel.High, "osCauseDamage"); |
@@ -3251,7 +3251,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3251 | } | 3251 | } |
3252 | } | 3252 | } |
3253 | } | 3253 | } |
3254 | 3254 | ||
3255 | public void osCauseHealing(string avatar, double healing) | 3255 | public void osCauseHealing(string avatar, double healing) |
3256 | { | 3256 | { |
3257 | CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); | 3257 | CheckThreatLevel(ThreatLevel.High, "osCauseHealing"); |
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index d1ff4f2..4df41cf 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -314,7 +314,7 @@ namespace OpenSim.Services.GridService | |||
314 | 314 | ||
315 | if (remoteRegionName != string.Empty) | 315 | if (remoteRegionName != string.Empty) |
316 | regInfo.RegionName = remoteRegionName; | 316 | regInfo.RegionName = remoteRegionName; |
317 | 317 | ||
318 | regInfo.RegionLocX = xloc; | 318 | regInfo.RegionLocX = xloc; |
319 | regInfo.RegionLocY = yloc; | 319 | regInfo.RegionLocY = yloc; |
320 | regInfo.ScopeID = scopeID; | 320 | regInfo.ScopeID = scopeID; |
@@ -387,7 +387,7 @@ namespace OpenSim.Services.GridService | |||
387 | regInfo.RegionName = externalName; | 387 | regInfo.RegionName = externalName; |
388 | 388 | ||
389 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); | 389 | m_log.DebugFormat("[HYPERGRID LINKER]: naming linked region {0}, handle {1}", regInfo.RegionName, handle.ToString()); |
390 | 390 | ||
391 | // Get the map image | 391 | // Get the map image |
392 | regInfo.TerrainImage = GetMapImage(regionID, imageURL); | 392 | regInfo.TerrainImage = GetMapImage(regionID, imageURL); |
393 | 393 | ||
@@ -497,7 +497,7 @@ namespace OpenSim.Services.GridService | |||
497 | RunHGCommand(command, cmdparams); | 497 | RunHGCommand(command, cmdparams); |
498 | 498 | ||
499 | } | 499 | } |
500 | 500 | ||
501 | private void RunLinkRegionCommand(string[] cmdparams) | 501 | private void RunLinkRegionCommand(string[] cmdparams) |
502 | { | 502 | { |
503 | int xloc, yloc; | 503 | int xloc, yloc; |