aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs3
-rw-r--r--ThirdPartyLicenses/MonoAddins.txt41
-rw-r--r--bin/Mono.Addins.CecilReflector.dllbin0 -> 364032 bytes
-rw-r--r--bin/Mono.Addins.Setup.dllbin0 -> 103424 bytes
-rw-r--r--bin/Mono.Addins.dllbin185344 -> 202752 bytes
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
1136 catch (Exception e) 1136 catch (Exception e)
1137 { 1137 {
1138 // Catch it and move on. This includes situations where splist has inconsistent info 1138 // Catch it and move on. This includes situations where splist has inconsistent info
1139 m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.Message); 1139 m_log.WarnFormat("[SCENE]: Problem processing action in ForEachSOG: ", e.ToString());
1140 } 1140 }
1141 } 1141 }
1142 } 1142 }
@@ -1177,7 +1177,6 @@ namespace OpenSim.Region.Framework.Scenes
1177 catch (Exception e) 1177 catch (Exception e)
1178 { 1178 {
1179 m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString()); 1179 m_log.Info("[BUG] in " + m_parentScene.RegionInfo.RegionName + ": " + e.ToString());
1180 m_log.Info("[BUG] Stack Trace: " + e.StackTrace);
1181 } 1180 }
1182 } 1181 }
1183 } 1182 }
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 @@
1Authors: Lluis Sanchez Gual <lluis@novell.com>
2
3The MIT License
4
5Copyright (C) 2007 Novell, Inc (http://www.novell.com)
6
7
8
9Permission is hereby granted, free of charge, to any person obtaining
10a copy
11 of this software and associated documentation files (the "Software"),
12to deal
13 in the Software without restriction, including without limitation
14the rights
15to use, copy, modify, merge, publish, distribute, sublicense,
16and/or sell
17copies of the Software, and to permit persons to whom the
18Software is
19furnished to do so, subject to the following conditions:
20
21
22
23The above copyright notice and this permission notice shall be included in
24
25all copies or substantial portions of the Software.
26
27
28
29THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
30EXPRESS OR
31IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
32MERCHANTABILITY,
33FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT.
34IN NO EVENT SHALL THE
35AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
36DAMAGES OR OTHER
37LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
38OTHERWISE, ARISING FROM,
39OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
40THE USE OR OTHER DEALINGS IN
41THE 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
Binary files differ
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
Binary files differ
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
Binary files differ