16 files changed, 283 insertions, 150 deletions

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index f22a6e8..45b45b2 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -458,10 +458,10 @@ namespace OpenSim.Framework.Servers
             }
         }
 
-
-        public string StatReport() {
-                return m_stats.XReport();
-        }
+        public string StatReport()
+        {
+            return m_stats.XReport();
+        }
             
         protected void RemovePIDFile()
         {
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
index a5ce8aa..ca0907d 100644
--- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
@@ -51,10 +51,10 @@ namespace OpenSim.Framework.Statistics
 
             return sb.ToString();
         }
-                
-                public virtual string XReport()
-                {
-                        return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
-                }
+        
+        public virtual string XReport()
+        {
+            return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
+        }
     }
 }
diff --git a/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs b/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs
index 48f28ee..ac8133d 100644
--- a/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/Interfaces/IStatsCollector.cs
@@ -37,13 +37,13 @@ namespace OpenSim.Framework.Statistics
         /// </summary>
         /// <returns></returns>
         string Report();
-                 
-                /// <summary>
-                /// Report back collected statistical information in json
-                /// </summary>
-                /// <returns>
-                /// A <see cref="System.String"/>
-                /// </returns>
-                string XReport();
+         
+        /// <summary>
+        /// Report back collected statistical information in json
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/>
+        /// </returns>
+        string XReport();
     }
 }
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 8b8b52a..d3513fc 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -383,45 +383,44 @@ Asset service request failures: {3}" + Environment.NewLine,
 
             return sb.ToString();
         }
-                
-                
+
         /// <summary>
         /// Report back collected statistical information.
         /// </summary>
         /// <returns></returns>
         public override string XReport()
         {
-                OSDMap args = new OSDMap(28);
-                args["AssetsInCache"] = OSD.FromReal(AssetsInCache);
-                args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0);
-                args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests);
-                args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures);
+            OSDMap args = new OSDMap(28);
+            args["AssetsInCache"] = OSD.FromReal(AssetsInCache);
+            args["TimeAfterCacheMiss"] = OSD.FromReal(assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0);
+            args["BlockedMissingTextureRequests"] = OSD.FromReal(BlockedMissingTextureRequests);
+            args["AssetServiceRequestFailures"] = OSD.FromReal(AssetServiceRequestFailures);
             args["abnormalClientThreadTerminations"] = OSD.FromReal(abnormalClientThreadTerminations);
-                args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures);
-                args["Dilatn"] = OSD.FromReal(timeDilation);
-                args["SimFPS"] = OSD.FromReal(simFps);
-                args["PhyFPS"] = OSD.FromReal(physicsFps);
-                args["AgntUp"] = OSD.FromReal(agentUpdates);
-                args["RootAg"] = OSD.FromReal(rootAgents);
-                args["ChldAg"] = OSD.FromReal(childAgents);
-                args["Prims"] = OSD.FromReal(totalPrims);
-                args["AtvPrm"] = OSD.FromReal(activePrims);
-                args["AtvScr"] = OSD.FromReal(activeScripts);
-                args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond);
-                args["PktsIn"] = OSD.FromReal(inPacketsPerSecond);
-                args["PktOut"] = OSD.FromReal(outPacketsPerSecond);
-                args["PendDl"] = OSD.FromReal(pendingDownloads);
-                args["PendUl"] = OSD.FromReal(pendingUploads);
-                args["UnackB"] = OSD.FromReal(unackedBytes);
-                args["TotlFt"] = OSD.FromReal(totalFrameTime);
-                args["NetFt"] = OSD.FromReal(netFrameTime);
-                args["PhysFt"] = OSD.FromReal(physicsFrameTime);
-                args["OthrFt"] = OSD.FromReal(otherFrameTime);
+            args["InventoryServiceRetrievalFailures"] = OSD.FromReal(InventoryServiceRetrievalFailures);
+            args["Dilatn"] = OSD.FromReal(timeDilation);
+            args["SimFPS"] = OSD.FromReal(simFps);
+            args["PhyFPS"] = OSD.FromReal(physicsFps);
+            args["AgntUp"] = OSD.FromReal(agentUpdates);
+            args["RootAg"] = OSD.FromReal(rootAgents);
+            args["ChldAg"] = OSD.FromReal(childAgents);
+            args["Prims"] = OSD.FromReal(totalPrims);
+            args["AtvPrm"] = OSD.FromReal(activePrims);
+            args["AtvScr"] = OSD.FromReal(activeScripts);
+            args["ScrLPS"] = OSD.FromReal(scriptLinesPerSecond);
+            args["PktsIn"] = OSD.FromReal(inPacketsPerSecond);
+            args["PktOut"] = OSD.FromReal(outPacketsPerSecond);
+            args["PendDl"] = OSD.FromReal(pendingDownloads);
+            args["PendUl"] = OSD.FromReal(pendingUploads);
+            args["UnackB"] = OSD.FromReal(unackedBytes);
+            args["TotlFt"] = OSD.FromReal(totalFrameTime);
+            args["NetFt"] = OSD.FromReal(netFrameTime);
+            args["PhysFt"] = OSD.FromReal(physicsFrameTime);
+            args["OthrFt"] = OSD.FromReal(otherFrameTime);
             args["AgntFt"] = OSD.FromReal(agentFrameTime);
-                args["ImgsFt"] = OSD.FromReal(imageFrameTime);
-                args["Memory"] = OSD.FromString(base.XReport());
-                        
-                string strBuffer = "";
+            args["ImgsFt"] = OSD.FromReal(imageFrameTime);
+            args["Memory"] = OSD.FromString(base.XReport());
+            
+            string strBuffer = "";
             byte[] buffer = new byte[1];
             
             strBuffer = OSDParser.SerializeJsonString(args);
@@ -452,10 +451,10 @@ Asset service request failures: {3}" + Environment.NewLine,
         {
             return m_statsProvider.GetStats();
         }
-                
-                public string XReport()
-                {
-                        return "";
-                }
+        
+        public string XReport()
+        {
+            return "";
+        }
     }
 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 18abcad..b28e880 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -813,14 +813,14 @@ namespace OpenSim
         /// Currently prints the same a "show stats" plus the uptime of the sim
         public class XSimStatusHandler : IStreamedRequestHandler
         {
-            OpenSimBase m_opensim;
-            
-            public XSimStatusHandler(OpenSimBase sim)
-            // public XSimStatusHandler(BaseOpenSimServer sim)
-            {
-                m_opensim = sim;
-            }
-                        
+            OpenSimBase m_opensim;
+        
+            public XSimStatusHandler(OpenSimBase sim)
+            // public XSimStatusHandler(BaseOpenSimServer sim)
+            {
+                m_opensim = sim;
+            }
+            
             public byte[] Handle(string path, Stream request,
                                  OSHttpRequest httpRequest, OSHttpResponse httpResponse)
             {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 4681230..40f25ae 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -10311,10 +10311,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             LLPacketHandler handler = (LLPacketHandler) m_PacketHandler;
             return handler.PacketQueue.GetStats();
         }
-                
-                public string XReport() 
-                {
-                        return  "";
-                }
+        
+        public string XReport() 
+        {
+            return  "";
+        }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index ca85817..c621fd3 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -546,8 +546,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             // through reconnect.
 
             if (m_enabled && (m_resetk == resetk))
-                            Reconnect();
-
+                Reconnect();
         }
 
         private Regex RE = new Regex(@":(?<nick>[\w-]*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)", 
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
index 2a2b4a3..d8fce67 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
              
              Hashtable response = new Hashtable();
              
-             foreach(DictionaryEntry item in request)
+             foreach (DictionaryEntry item in request)
              {
                 m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value);
              }
@@ -52,37 +52,37 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
              response["keepalive"] = false;
              response["int_response_code"]=200;
              response["str_response_string"] = @"<?xml version=""1.0"" encoding=""utf-8""?>
-                                <document type=""freeswitch/xml"">
-                                  <section name=""dialplan"">
-                                  <context name=""default"">
-                                
-                                        <!-- dial via SIP uri -->
-                                        <extension name=""sip_uri"">
-                                                <condition field=""destination_number"" expression=""^sip:(.*)$"">
-                                                <action application=""bridge"" data=""sofia/${use_profile}/$1""/>
-                                                <!--<action application=""bridge"" data=""$1""/>-->
-                                                </condition>
-                                        </extension>
-                                
-                                        <extension name=""opensim_conferences"">
-                                                <condition field=""destination_number"" expression=""^confctl-(.*)$"">
-                                                        <action application=""answer""/>
-                                                        <action application=""conference"" data=""$1-${domain_name}@default""/>
-                                                </condition>
-                                        </extension>
-                                
-                                        <extension name=""avatar"">
-                                                <condition field=""destination_number"" expression=""^(x.*)$"">
-                                                        <action application=""bridge"" data=""user/$1""/>
-                                                </condition>
-                                        </extension>
-                                
-                                  </context>
-                                </section>
-                                </document>";
+                <document type=""freeswitch/xml"">
+                  <section name=""dialplan"">
+                  <context name=""default"">
+                
+                        <!-- dial via SIP uri -->
+                        <extension name=""sip_uri"">
+                                <condition field=""destination_number"" expression=""^sip:(.*)$"">
+                                <action application=""bridge"" data=""sofia/${use_profile}/$1""/>
+                                <!--<action application=""bridge"" data=""$1""/>-->
+                                </condition>
+                        </extension>
+                
+                        <extension name=""opensim_conferences"">
+                                <condition field=""destination_number"" expression=""^confctl-(.*)$"">
+                                        <action application=""answer""/>
+                                        <action application=""conference"" data=""$1-${domain_name}@default""/>
+                                </condition>
+                        </extension>
+                
+                        <extension name=""avatar"">
+                                <condition field=""destination_number"" expression=""^(x.*)$"">
+                                        <action application=""bridge"" data=""user/$1""/>
+                                </condition>
+                        </extension>
+                
+                  </context>
+                </section>
+                </document>";
              
              return response;   
         }    
     }
     
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
index 9959d11..4113976 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
              //domain=9.20.151.43
              //ip=9.167.220.137    // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
              
-             foreach(DictionaryEntry item in request)
+             foreach (DictionaryEntry item in request)
              {
                 m_log.InfoFormat("[FreeSwitchDirectory] requestBody item {0} {1}",item.Key, item.Value);
              }
@@ -71,41 +71,41 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
              string eventCallingFunction = (string) request["Event-Calling-Function"];
              
              
-             if(eventCallingFunction=="sofia_reg_parse_auth")
+             if (eventCallingFunction=="sofia_reg_parse_auth")
              {
                  string sipAuthMethod = (string)request["sip_auth_method"];
-                     
-                     if(sipAuthMethod=="REGISTER")
-                     {
-                         response = HandleRegister(request);
-                     } 
-                     else if(sipAuthMethod=="INVITE")  
-                     {
-                         response = HandleInvite(request);
-                     }
-                     else
-                     {
-                         m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod);
-                         response["int_response_code"]=404;
-                     }
+                 
+                 if (sipAuthMethod=="REGISTER")
+                 {
+                     response = HandleRegister(request);
+                 } 
+                 else if (sipAuthMethod=="INVITE")  
+                 {
+                     response = HandleInvite(request);
+                 }
+                 else
+                 {
+                     m_log.ErrorFormat("[FreeSwitchVoice] HandleDirectoryRequest unknown sip_auth_method {0}",sipAuthMethod);
+                     response["int_response_code"]=404;
+                 }
              }
-                 else if(eventCallingFunction=="switch_xml_locate_user")
-                 {
-                     response = HandleLocateUser(request);
+             else if (eventCallingFunction=="switch_xml_locate_user")
+             {
+                 response = HandleLocateUser(request);
              }
-             else if(eventCallingFunction=="user_data_function") // gets called when an avatar to avatar call is made
+             else if (eventCallingFunction=="user_data_function") // gets called when an avatar to avatar call is made
              {
                  response = HandleLocateUser(request);
              }
-             else if(eventCallingFunction=="user_outgoing_channel")
+             else if (eventCallingFunction=="user_outgoing_channel")
              {
                  response = HandleRegister(request);
              }
-             else if(eventCallingFunction=="config_sofia") // happens once on freeswitch startup
+             else if (eventCallingFunction=="config_sofia") // happens once on freeswitch startup
              {
                  response = HandleConfigSofia(request);
              }
-             else if(eventCallingFunction=="switch_load_network_lists")
+             else if (eventCallingFunction=="switch_load_network_lists")
              {
                  //response = HandleLoadNetworkLists(request);
                  response["int_response_code"]=404;
@@ -266,24 +266,24 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                             "<groups name=\"default\">\r\n"+
                                 "<users>\r\n"+
                                     "<user id=\"$${{default_provider}}\">\r\n"+
-                                                                            "<gateways>\r\n"+
-                                                                              "<gateway name=\"$${{default_provider}}\">\r\n"+
-                                                                                "<param name=\"username\" value=\"$${{default_provider_username}}\"/>\r\n"+
-                                                                                "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
-                                                                                "<param name=\"from-user\" value=\"$${{default_provider_username}}\"/>\r\n"+
-                                                                                "<param name=\"from-domain\" value=\"$${{default_provider_from_domain}}\"/>\r\n"+
-                                                                                "<param name=\"expire-seconds\" value=\"600\"/>\r\n"+
-                                                                                "<param name=\"register\" value=\"$${{default_provider_register}}\"/>\r\n"+
-                                                                                "<param name=\"retry-seconds\" value=\"30\"/>\r\n"+
-                                                                                "<param name=\"extension\" value=\"$${{default_provider_contact}}\"/>\r\n"+
-                                                                                "<param name=\"contact-params\" value=\"domain_name=$${{domain}}\"/>\r\n"+
-                                                                                "<param name=\"context\" value=\"public\"/>\r\n"+
-                                                                              "</gateway>\r\n"+
-                                                                            "</gateways>\r\n"+
-                                                                            "<params>\r\n"+
-                                                                              "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
-                                                                            "</params>\r\n"+
-                                                                          "</user>\r\n"+
+                                        "<gateways>\r\n"+
+                                          "<gateway name=\"$${{default_provider}}\">\r\n"+
+                                            "<param name=\"username\" value=\"$${{default_provider_username}}\"/>\r\n"+
+                                            "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
+                                            "<param name=\"from-user\" value=\"$${{default_provider_username}}\"/>\r\n"+
+                                            "<param name=\"from-domain\" value=\"$${{default_provider_from_domain}}\"/>\r\n"+
+                                            "<param name=\"expire-seconds\" value=\"600\"/>\r\n"+
+                                            "<param name=\"register\" value=\"$${{default_provider_register}}\"/>\r\n"+
+                                            "<param name=\"retry-seconds\" value=\"30\"/>\r\n"+
+                                            "<param name=\"extension\" value=\"$${{default_provider_contact}}\"/>\r\n"+
+                                            "<param name=\"contact-params\" value=\"domain_name=$${{domain}}\"/>\r\n"+
+                                            "<param name=\"context\" value=\"public\"/>\r\n"+
+                                          "</gateway>\r\n"+
+                                        "</gateways>\r\n"+
+                                        "<params>\r\n"+
+                                          "<param name=\"password\" value=\"$${{default_provider_password}}\"/>\r\n"+
+                                        "</params>\r\n"+
+                                      "</user>\r\n"+
                                 "</users>"+
                             "</groups>\r\n" +
                             "<variables>\r\n"+
@@ -332,4 +332,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
        
     }
     
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index a8f9de6..fcb1c97 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -500,7 +500,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
             // is this a dialplan or directory request 
             string section = (string) requestBody["section"];
             
-            if(section=="directory")
+            if (section=="directory")
                 response = m_FreeSwitchDirectory.HandleDirectoryRequest(requestBody);
             else if (section=="dialplan")
                 response = m_FreeSwitchDialplan.HandleDialplanRequest(requestBody);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
index ec26dff..9f45fd0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             string firstname, lastname;
             IClientAPI agent;
-            if( m_ActiveClients.TryGetValue(AgentID, out agent) )
+            if (m_ActiveClients.TryGetValue(AgentID, out agent))
             {
                 firstname = agent.FirstName;
                 lastname = agent.LastName;
@@ -405,7 +405,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 }
 
                 UUID GroupID = new UUID(im.toAgentID);
-                if( m_groupData.GetGroupRecord(GroupID, null) != null)
+                if (m_groupData.GetGroupRecord(GroupID, null) != null)
                 {
                     UUID NoticeID = UUID.Random();
                     string Subject = im.message.Substring(0, im.message.IndexOf('|'));
@@ -453,9 +453,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     GridInstantMessage msg = CreateGroupNoticeIM(UUID.Zero, NoticeID, (byte)OpenMetaverse.InstantMessageDialog.GroupNotice);
 
                     // Send notice out to everyone that wants notices
-                    foreach( GroupMembersData member in m_groupData.GetGroupMembers(GroupID) )
+                    foreach (GroupMembersData member in m_groupData.GetGroupMembers(GroupID))
                     {
-                        if( member.AcceptNotices )
+                        if (member.AcceptNotices)
                         {
                             msg.toAgentID = member.AgentID.Guid;
                             m_MsgTransferModule.SendInstantMessage(msg, delegate(bool success) { });
@@ -712,7 +712,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         {
             if (m_debugEnabled) m_log.InfoFormat("[GROUPS] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
 
-            if( m_groupData.GetGroupRecord(UUID.Zero, name) != null )
+            if (m_groupData.GetGroupRecord(UUID.Zero, name) != null)
             {
                 remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists.");
                 return UUID.Zero;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs
index d3efe9c..d8f7a84 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/ExtensionHandler.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.Text;
 using OpenSim.Region.OptionalModules.Scripting.Minimodule.Interfaces;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs
index 05b8bc9..486d0d9 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IMRMModule.cs
@@ -1,3 +1,30 @@
+/*
+ * 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.
+ */
+
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
     public interface IMRMModule
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.cs
index 91c696f..f5beebd 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IExtension.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.Text;
 
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
index f850a94..13e7934 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IScheduler.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;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectShape.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectShape.cs
index 0018b2a..27cf279 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectShape.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Object/IObjectShape.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.Text;
 using OpenMetaverse;