Formatting cleanup.

OpenSim/Region/CoreModules/World/Sun/SunModule.cs

@@ -44,10 +44,8 @@ namespace OpenSim.Region.CoreModules
         /// it is not based on ~06:00 == Sun Rise.   Rather it is based on 00:00 being sun-rise.
         /// </summary>
 
-
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-
         //
         // Global Constants used to determine where in the sky the sun is
         //
@@ -128,15 +126,12 @@ namespace OpenSim.Region.CoreModules
         private Vector3 Velocity = Vector3.Zero;
         private Quaternion Tilt = new Quaternion(1.0f, 0.0f, 0.0f, 0.0f);
 
-
         // Used to fix the sun in the sky so it doesn't move based on current time
         private bool m_SunFixed = false;
         private float m_SunFixedHour = 0f;
 
         private const int TICKS_PER_SECOND = 10000000;
 
-
-
         // Current time in elapsed seconds since Jan 1st 1970
         private ulong CurrentTime
         {
@@ -149,8 +144,6 @@ namespace OpenSim.Region.CoreModules
         // Time in seconds since UTC to use to calculate sun position.
         ulong PosTime = 0;
 
-
-
         /// <summary>
         /// Calculate the sun's orbital position and its velocity.
         /// </summary>
@@ -202,7 +195,6 @@ namespace OpenSim.Region.CoreModules
                         PosTime += (ulong)(((CurDayPercentage - 0.5) / .5) * NightSeconds);
                     }
                 }
-
             }
 
             TotalDistanceTravelled = SunSpeed * PosTime;  // distance measured in radians
@@ -251,7 +243,6 @@ namespace OpenSim.Region.CoreModules
                 Velocity.X = 0;
                 Velocity.Y = 0;
                 Velocity.Z = 0;
-
             }
             else
             {
@@ -271,9 +262,7 @@ namespace OpenSim.Region.CoreModules
         private float GetCurrentTimeAsLindenSunHour()
         {
             if (m_SunFixed)
-            {
                 return m_SunFixedHour + 6;
-            }
 
             return GetCurrentSunHour() + 6.0f;
         }
@@ -297,8 +286,6 @@ namespace OpenSim.Region.CoreModules
                 m_scene.AddCommand(this, String.Format("sun {0}", kvp.Key), String.Format("{0} - {1}", kvp.Key, kvp.Value), "", HandleSunConsoleCommand);
             }
 
-
-
             TimeZone local = TimeZone.CurrentTimeZone;
             TicksUTCOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks;
             m_log.Debug("[SUN]: localtime offset is " + TicksUTCOffset);
@@ -325,13 +312,11 @@ namespace OpenSim.Region.CoreModules
                 // must hard code to ~.5 to match sun position in LL based viewers
                 m_HorizonShift   = config.Configs["Sun"].GetDouble("day_night_offset", d_day_night);
 
-                
                 // Scales the sun hours 0...12 vs 12...24, essentially makes daylight hours longer/shorter vs nighttime hours
                 m_DayTimeSunHourScale = config.Configs["Sun"].GetDouble("day_time_sun_hour_scale", d_DayTimeSunHourScale);
 
                 // Update frequency in frames
                 m_UpdateInterval   = config.Configs["Sun"].GetInt("update_interval", d_frame_mod);
-
             }
             catch (Exception e)
             {
@@ -391,10 +376,8 @@ namespace OpenSim.Region.CoreModules
             }
 
             scene.RegisterModuleInterface<ISunModule>(this);
-
         }
 
-
         public void PostInitialise()
         {
         }
@@ -419,6 +402,7 @@ namespace OpenSim.Region.CoreModules
         {
             get { return false; }
         }
+
         #endregion
 
         #region EventManager Events
@@ -446,9 +430,7 @@ namespace OpenSim.Region.CoreModules
         public void SunUpdate()
         {
             if (((m_frame++ % m_UpdateInterval) != 0) || !ready || m_SunFixed || !receivedEstateToolsSunUpdate)
-            {
                 return;
-            }
 
             GenSunPos();        // Generate shared values once
 
@@ -484,7 +466,6 @@ namespace OpenSim.Region.CoreModules
                 while (FixedSunHour < 0)
                     FixedSunHour += 24;
 
-
                 m_SunFixedHour = FixedSunHour;
                 m_SunFixed = FixedSun;
 
@@ -499,14 +480,12 @@ namespace OpenSim.Region.CoreModules
                 // When sun settings are updated, we should update all clients with new settings.
                 SunUpdateToAllClients();
 
-
                 m_log.DebugFormat("[SUN]: PosTime : {0}", PosTime.ToString());
             }
         }
 
         #endregion
 
-
         private void SunUpdateToAllClients()
         {
             m_scene.ForEachScenePresence(delegate(ScenePresence sp)
@@ -553,7 +532,6 @@ namespace OpenSim.Region.CoreModules
         {
             float ticksleftover = CurrentTime % SecondsPerSunCycle;
 
-
             return (24.0f * (ticksleftover / SecondsPerSunCycle));
         }
 
@@ -666,7 +644,6 @@ namespace OpenSim.Region.CoreModules
 
                 // When sun settings are updated, we should update all clients with new settings.
                 SunUpdateToAllClients();
-
             }
 
             return Output;

OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs

@@ -304,7 +304,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
         public void PostInitialise()
         {
-            
         }
 
         public void Close()
@@ -350,7 +349,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             if (!Directory.Exists(tmp))
                 Directory.CreateDirectory(tmp);
 
-
             m_log.Info("MRM 2");
 
             try
@@ -396,8 +394,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
             parameters.IncludeDebugInformation = true;
 
-            string rootPath =
+            string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
-                Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);
 
             List<string> libraries = new List<string>();
             string[] lines = Script.Split(new string[] {"\n"}, StringSplitOptions.RemoveEmptyEntries);