Add copyright header. Formatting cleanup.

7 files changed, 60 insertions, 39 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
index ea205a2..2b336bb 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 51bb114..ec262b0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3517,7 +3517,7 @@ if (m_shape != null) {
             }
             else
             {   // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
-                // (mumbles, well, at least if you have infinte CPU powers :-) )
+                // (mumbles, well, at least if you have infinte CPU powers :-))
                 PhysicsActor pa = this.PhysActor;
                 if (pa != null)
                 {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 6b30959..c7bb56a 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -260,12 +260,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
         
         public void PostInitialise()
         {
-            if(m_pluginEnabled)
+            if (m_pluginEnabled)
             {
-                    m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene");
-                    
-                    // register the voice interface for this module, so the script engine can call us
-                    m_scene.RegisterModuleInterface<IVoiceModule>(this);
+                m_log.Info("[FreeSwitchVoice] registering IVoiceModule with the scene");
+                
+                // register the voice interface for this module, so the script engine can call us
+                m_scene.RegisterModuleInterface<IVoiceModule>(this);
             }
         }
 
@@ -811,7 +811,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             
             lock (m_ParcelAddress)
             {
-                if (m_ParcelAddress.ContainsKey( land.GlobalID.ToString() ))
+                if (m_ParcelAddress.ContainsKey(land.GlobalID.ToString()))
                 {
                     m_log.DebugFormat("[FreeSwitchVoice]: parcel id {0}: using sip address {1}", 
                                       land.GlobalID, m_ParcelAddress[land.GlobalID.ToString()]);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 805c3d4..964d0bb 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -871,7 +871,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 m_log.ErrorFormat("[XMLRPCGROUPDATA]: An error has occured while attempting to access the XmlRpcGroups server method: {0}", function);
                 m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", e.ToString());
 
-                foreach( string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
+                foreach (string ResponseLine in req.RequestResponse.Split(new string[] { Environment.NewLine },StringSplitOptions.None))
                 {
                     m_log.ErrorFormat("[XMLRPCGROUPDATA]: {0} ", ResponseLine);
                 }
diff --git a/OpenSim/Region/Physics/Meshing/Mesh.cs b/OpenSim/Region/Physics/Meshing/Mesh.cs
index 7567556..aae8871 100644
--- a/OpenSim/Region/Physics/Meshing/Mesh.cs
+++ b/OpenSim/Region/Physics/Meshing/Mesh.cs
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Physics.Meshing
 
         public float[] getVertexListAsFloatLocked()
         {
-            if( pinnedVirtexes.IsAllocated )
+            if (pinnedVirtexes.IsAllocated)
                 return (float[])(pinnedVirtexes.Target);
             float[] result;
 
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 0873035..56eb359 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Physics.Meshing
 
         }
 
-        private ulong GetMeshKey( PrimitiveBaseShape pbs, PhysicsVector size, float lod )
+        private ulong GetMeshKey(PrimitiveBaseShape pbs, PhysicsVector size, float lod)
         {
             ulong hash = 5381;
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 5a94957..fe26429 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -546,11 +546,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     bool retried  = false;
                     do
                     {
-                                                lock (CScodeProvider)
-                                                {
-                                                        results = CScodeProvider.CompileAssemblyFromSource(
-                                                                parameters, Script);
-                                                }
+                        lock (CScodeProvider)
+                        {
+                            results = CScodeProvider.CompileAssemblyFromSource(
+                                parameters, Script);
+                        }
                         // Deal with an occasional segv in the compiler.
                         // Rarely, if ever, occurs twice in succession.
                         // Line # == 0 and no file name are indications that
@@ -573,20 +573,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                         {
                             complete = true;
                         }
-                    }
-                    while(!complete);
+                    } while (!complete);
                     break;
                 case enumCompileType.js:
                     results = JScodeProvider.CompileAssemblyFromSource(
-                            parameters, Script);
+                        parameters, Script);
                     break;
                 case enumCompileType.yp:
                     results = YPcodeProvider.CompileAssemblyFromSource(
-                            parameters, Script);
+                        parameters, Script);
                     break;
                 default:
                     throw new Exception("Compiler is not able to recongnize "+
-                            "language type \"" + lang.ToString() + "\"");
+                                        "language type \"" + lang.ToString() + "\"");
             }
 
             // Check result
@@ -602,12 +601,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             {
                 foreach (CompilerError CompErr in results.Errors)
                 {
-
-                    string severity = "Error";
-                    if (CompErr.IsWarning)
-                    {
-                        severity = "Warning";
-                    }
+                    string severity = CompErr.IsWarning ? "Warning" : "Error";
 
                     KeyValuePair<int, int> lslPos;
 
@@ -615,18 +609,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
                     if (severity == "Error")
                     {
-                                                lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
-                                                string text = CompErr.ErrorText;
-
-                                                // Use LSL type names
-                                                if (lang == enumCompileType.lsl)
-                                                        text = ReplaceTypes(CompErr.ErrorText);
-
-                                                // The Second Life viewer's script editor begins
-                                                // countingn lines and columns at 0, so we subtract 1.
-                                                errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
-                                                                lslPos.Key - 1, lslPos.Value - 1,
-                                                                CompErr.ErrorNumber, text, severity);
+                        lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
+                        string text = CompErr.ErrorText;
+
+                        // Use LSL type names
+                        if (lang == enumCompileType.lsl)
+                            text = ReplaceTypes(CompErr.ErrorText);
+
+                        // The Second Life viewer's script editor begins
+                        // countingn lines and columns at 0, so we subtract 1.
+                        errtext += String.Format("Line ({0},{1}): {4} {2}: {3}\n",
+                                lslPos.Key - 1, lslPos.Value - 1,
+                                CompErr.ErrorNumber, text, severity);
                         hadErrors = true;
                     }
                 }