Merge branch 'master' into careminster-presence-refactor

5 files changed, 42 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 1163ebf..d4e3717 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1136,7 +1136,7 @@ namespace OpenSim.Region.Framework.Scenes
                 catch (Exception e)
                 {
                     // Catch it and move on. This includes situations where splist has inconsistent info
-                    m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.Message);
+                    m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.ToString());
                 }
             }
         }
@@ -1177,7 +1177,6 @@ namespace OpenSim.Region.Framework.Scenes
                 catch (Exception e)
                 {
                     m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString());
-                    m_log.Info("[BUG] Stack Trace: " + e.StackTrace);
                 }
             }
         }
diff --git a/ThirdPartyLicenses/MonoAddins.txt b/ThirdPartyLicenses/MonoAddins.txt
new file mode 100644
index 0000000..10c23b3
--- /dev/null
+++ b/ThirdPartyLicenses/MonoAddins.txt
@@ -0,0 +1,41 @@
+Authors: Lluis Sanchez Gual  <lluis@novell.com>
+
+The MIT License
+
+Copyright (C) 2007 Novell, Inc (http://www.novell.com)
+
+
+
+Permission is hereby granted, free of charge, to any person obtaining 
+a copy
+ of this software and associated documentation files (the "Software"), 
+to deal
+ in the Software without restriction, including without limitation 
+the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell 
+copies of the Software, and to permit persons to whom the 
+Software is 
+furnished to do so, subject to the following conditions:
+
+
+
+The above copyright notice and this permission notice shall be included in
+
+all copies or substantial portions of the Software.
+
+
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. 
+IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll
new file mode 100644
index 0000000..a1a6382
--- /dev/null
+++ b/bin/Mono.Addins.CecilReflector.dll
diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll
new file mode 100644
index 0000000..8aa6d5f
--- /dev/null
+++ b/bin/Mono.Addins.Setup.dll
diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll
index 5dc9520..ea330fd 100644
--- a/bin/Mono.Addins.dll
+++ b/bin/Mono.Addins.dll