Add copyright headers. Formatting cleanup.

OpenSim/ApplicationPlugins/Rest/Inventory/RestFileServices.cs

@@ -203,7 +203,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 try
                 {
                     path = rdata.path.Substring(rdata.Parameters[0].Length+qPrefix.Length+2);
-					if(File.Exists(path))
+                    if (File.Exists(path))
                     {
                         Rest.Log.DebugFormat("{0}  File located <{1}>", MsgId, path);
                         Byte[] data = File.ReadAllBytes(path);
@@ -391,7 +391,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                 {
                     path = rdata.path.Substring(rdata.Parameters[0].Length+qPrefix.Length+2);
 
-					if(File.Exists(path))
+                    if (File.Exists(path))
                     {
                         File.Delete(path);
                     }

OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs

@@ -259,7 +259,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
                     Connect();
                 }
 
-                lock(m_connectors)
+                lock (m_connectors)
                     m_connectors.Add(this);
 
                 m_enabled = true;
@@ -306,7 +306,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
 
                     }
        
-                    lock(m_connectors)
+                    lock (m_connectors)
                         m_connectors.Remove(this);
 
                 }
@@ -845,7 +845,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             _pdk_ = (_pdk_+1)%PING_PERIOD;    // cycle the ping trigger
             _icc_++;    // increment the inter-consecutive-connect-delay counter
 
-            lock(m_connectors)
+            lock (m_connectors)
             foreach (IRCConnector connector in m_connectors)
             {
 

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsMessaging.cs

@@ -105,7 +105,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 }
 
                 m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true);
-
             }
 
             m_log.Info("[GROUPS-MESSAGING]: XmlRpcGroupsMessaging starting up");
@@ -123,7 +122,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-
             m_groupsModule = scene.RequestModuleInterface<IGroupsModule>();
 
             // No groups module, no groups messaging
@@ -164,13 +162,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             m_sceneList.Remove(scene);
         }
 
-
         public void Close()
         {
             if (!m_groupMessagingEnabled)
                 return;
 
-            if(m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module.");
+            if (m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module.");
 
             foreach (Scene scene in m_sceneList)
             {
@@ -227,14 +224,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             // Incoming message from a group
             if ((msg.fromGroup == true) && 
-                ( (msg.dialog == (byte)InstantMessageDialog.SessionSend)
+                ((msg.dialog == (byte)InstantMessageDialog.SessionSend)
                  || (msg.dialog == (byte)InstantMessageDialog.SessionAdd)
-                  || (msg.dialog == (byte)InstantMessageDialog.SessionDrop)
+                 || (msg.dialog == (byte)InstantMessageDialog.SessionDrop)))
-                ))
             {
                 ProcessMessageFromGroupSession(msg);
             }
-
         }
 
         private void ProcessMessageFromGroupSession(GridInstantMessage msg)
@@ -297,7 +292,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                                     , false //isModerator
                                     , false //text mute
                                     );
-
                             }
                         }
                     }
@@ -325,24 +319,22 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
         }
 
-
-
         #endregion
 
         #region ClientEvents
 
         private void RemoveAgentFromGroupSession(Guid agentID, Guid sessionID)
         {
-            if( m_agentsInGroupSession.ContainsKey(sessionID) )
+            if (m_agentsInGroupSession.ContainsKey(sessionID))
             {
                 // If in session remove
-                if( m_agentsInGroupSession[sessionID].Contains(agentID) )
+                if (m_agentsInGroupSession[sessionID].Contains(agentID))
                 {
                     m_agentsInGroupSession[sessionID].Remove(agentID);
                 }
 
                 // If not in dropped list, add
-                if( !m_agentsDroppedSession[sessionID].Contains(agentID) )
+                if (!m_agentsDroppedSession[sessionID].Contains(agentID))
                 {
                     if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Dropped {1} from session {0}", sessionID, agentID);
                     m_agentsDroppedSession[sessionID].Add(agentID);
@@ -356,13 +348,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             CreateGroupSessionTracking(sessionID);
 
             // If nessesary, remove from dropped list
-            if( m_agentsDroppedSession[sessionID].Contains(agentID) )
+            if (m_agentsDroppedSession[sessionID].Contains(agentID))
             {
                 m_agentsDroppedSession[sessionID].Remove(agentID);
             }
 
             // If nessesary, add to in session list
-            if( !m_agentsInGroupSession[sessionID].Contains(agentID) )
+            if (!m_agentsInGroupSession[sessionID].Contains(agentID))
             {
                 if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] Added {1} to session {0}", sessionID, agentID);
                 m_agentsInGroupSession[sessionID].Add(agentID);
@@ -424,13 +416,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 SendMessageToGroup(im, groupID);
             }
         }
+
         #endregion
 
         private void SendMessageToGroup(GridInstantMessage im, UUID groupID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS-MESSAGING] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-
             foreach (GroupMembersData member in m_groupsModule.GroupMembersRequest(null, groupID))
             {
                 if (m_agentsDroppedSession[im.imSessionID].Contains(member.AgentID.Guid))
@@ -488,24 +480,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             sessionMap.Add("type", OSD.FromInteger(0));
             sessionMap.Add("voice_enabled", OSD.FromBoolean(false));
 
-
             OSDMap bodyMap = new OSDMap(4);
             bodyMap.Add("session_id", OSD.FromUUID(groupID));
             bodyMap.Add("temp_session_id", OSD.FromUUID(groupID));
             bodyMap.Add("success", OSD.FromBoolean(true));
             bodyMap.Add("session_info", sessionMap);
 
-
             IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>();
 
             if (queue != null)
             {
                 queue.Enqueue(EventQueueHelper.buildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId);
             }
-
         }
 
-
         private void DebugGridInstantMessage(GridInstantMessage im)
         {
             if (m_debugEnabled)
@@ -555,5 +543,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         #endregion
     }
-
 }

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs

@@ -313,16 +313,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 GroupName = "Unknown";
             }
 
-
             remote_client.SendGroupNameReply(GroupID, GroupName);
         }
 
-
         private void OnInstantMessage(IClientAPI remoteClient, GridInstantMessage im)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-
             // Group invitations
             if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline))
             {
@@ -334,7 +331,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 UUID fromAgentID = new UUID(im.fromAgentID);
                 if ((inviteInfo != null) && (fromAgentID == inviteInfo.AgentID))
                 {
-
                     // Accept
                     if (im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept)
                     {
@@ -373,10 +369,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     {
                         if (m_debugEnabled) m_log.DebugFormat("[GROUPS] Received a reject invite notice.");
                         m_groupData.RemoveAgentToGroupInvite(inviteID);
-
                     }
-
-
                 }
             }
 
@@ -429,7 +422,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                         bucket[18] = 0; //dunno
                     }
 
-
                     m_groupData.AddGroupNotice(GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket);
                     if (OnNewGroupNotice != null)
                     {
@@ -446,12 +438,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
                             msg.toAgentID = member.AgentID.Guid;
                             OutgoingInstantMessage(msg, member.AgentID);
-
                         }
                     }
-
-
-
                 }
             }
             
@@ -477,11 +465,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     UUID groupID = new UUID(im.fromAgentID);
                     ejectee.SendAgentDropGroup(groupID);
                 }
-
             }
-
-
-
         }
 
         private void OnGridInstantMessage(GridInstantMessage msg)
@@ -491,7 +475,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             // Trigger the above event handler
             OnInstantMessage(null, msg);
 
-
             // If a message from a group arrives here, it may need to be forwarded to a local client
             if (msg.fromGroup == true)
             {
@@ -501,17 +484,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     case (byte)InstantMessageDialog.GroupNotice:
                         UUID toAgentID = new UUID(msg.toAgentID);
                         IClientAPI localClient = GetActiveClient(toAgentID);
-                        if( localClient != null )
+                        if (localClient != null)
                         {
                             localClient.SendInstantMessage(msg);
                         }
                         break;
                 }
             }
-
         }
 
-
         #endregion
 
         #region IGroupsModule Members

OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IMicrothreader.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;
 using System.Collections.Generic;
 using System.Text;

OpenSim/Region/OptionalModules/Scripting/Minimodule/MicroScheduler.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;
 using System.Collections.Generic;
 using System.Text;
@@ -20,7 +47,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         {
             lock (m_threads)
             {
-                if(m_threads.Count == 0)
+                if (m_threads.Count == 0)
                     return;
 
                 int i = 0;

OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/TestModule.cs

@@ -42,7 +42,7 @@ namespace OpenSim
             Host.Console.Info("Microthreaded 2" + param);
             yield return null;
             int c = 100;
-            while(c-- < 0)
+            while (c-- < 0)
             {
                 Host.Console.Info("Microthreaded Looped " + c + " " + param);
                 yield return null;
@@ -64,7 +64,7 @@ namespace OpenSim
             Microthread(TestMicrothread("Ohai"));
 
             int i = 0;
-            while(threads.Count > 0)
+            while (threads.Count > 0)
             {
                 i++;
                 bool running = threads[i%threads.Count].MoveNext();

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -6894,7 +6894,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-
         public LSL_String llXorBase64Strings(string str1, string str2)
         {
             m_host.AddScriptLPS(1);
@@ -7215,7 +7214,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 // vector profilecut
                                 res.Add(new LSL_Vector(Shape.ProfileBegin / 50000.0, 1 - Shape.ProfileEnd / 50000.0, 0));
 
-
                                 // vector tapera
                                 res.Add(new LSL_Vector(Shape.PathTaperX / 100.0, Shape.PathTaperY / 100.0, 0));
 
@@ -7228,7 +7226,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 // float skew
                                 res.Add(new LSL_Float(Shape.PathSkew / 100.0));
                                 break;
-
                         }
                         break;