Merge branch 'master' into varregion

author: Robert Adams 2013-11-24 07:23:12 -0800
committer: Robert Adams 2013-11-24 07:23:12 -0800
commit: 3193bcaae1cbe86d22c4ade5c79d5e25d11a59da (patch)
tree: c96b96a7302f5323df63f6255e528de68ab67c6f /bin
parent: Merge branch 'master' into varregion (diff)
parent: Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
download: opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.zip
opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.gz
opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.bz2
opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.xz
9 files changed, 8 insertions, 89 deletions
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index 6a6b3c8..a07ace3 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -4,6 +4,7 @@
    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
  </configSections>
  <runtime>
+    <loadFromRemoteSources enabled="true" />
    <gcConcurrent enabled="true" />
        <gcServer enabled="true" />
  </runtime>
diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config
index 7aa974c..3a50408 100644
--- a/bin/OpenSim.ConsoleClient.exe.config
+++ b/bin/OpenSim.ConsoleClient.exe.config
@@ -4,6 +4,7 @@
    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
  </configSections>
  <runtime>
+    <loadFromRemoteSources enabled="true" />
    <gcConcurrent enabled="true" />
        <gcServer enabled="true" />
  </runtime>
diff --git a/bin/OpenSim.Services.exe.config b/bin/OpenSim.Services.exe.config
deleted file mode 100644
index c2d93c0..0000000
--- a/bin/OpenSim.Services.exe.config
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <runtime>
-    <gcConcurrent enabled="true" />
-        <gcServer enabled="true" />
-  </runtime>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index b2cb4e5..1ec3c9c 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -4,6 +4,7 @@
    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
  </configSections>
  <runtime>
+    <loadFromRemoteSources enabled="true" />
    <gcConcurrent enabled="true" />
        <gcServer enabled="true" />
  </runtime>
diff --git a/bin/OpenSimExport.exe.config b/bin/OpenSimExport.exe.config
deleted file mode 100644
index 3fcb22d..0000000
--- a/bin/OpenSimExport.exe.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimExport.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
index ec17049..f2802a2 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -4,6 +4,7 @@
    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
  </configSections>
  <runtime>
+    <loadFromRemoteSources enabled="true" />
    <gcConcurrent enabled="true" />
        <gcServer enabled="true" />
  </runtime>
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 62975fd..6ffdfef 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -4,6 +4,7 @@
    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
  </configSections>
  <runtime>
+    <loadFromRemoteSources enabled="true" />
    <gcConcurrent enabled="true" />
        <gcServer enabled="true" />
  </runtime>
diff --git a/bin/SimpleApp.exe.config b/bin/SimpleApp.exe.config
deleted file mode 100644
index c4d9c22..0000000
--- a/bin/SimpleApp.exe.config
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="SimpleApp.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config
index 9cfb7e9..7912991 100755
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config
@@ -3,6 +3,9 @@
  <configSections>
    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
  </configSections>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+  </runtime>
  <appSettings>
  </appSettings>
  <log4net>
author	Robert Adams	2013-11-24 07:23:12 -0800
committer	Robert Adams	2013-11-24 07:23:12 -0800
commit	3193bcaae1cbe86d22c4ade5c79d5e25d11a59da (patch)
tree	c96b96a7302f5323df63f6255e528de68ab67c6f /bin
parent	Merge branch 'master' into varregion (diff)
parent	Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
download	opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.zip opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.gz opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.bz2 opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.xz

diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config index 6a6b3c8..a07ace3 100644 --- a/bin/OpenSim.32BitLaunch.exe.config +++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -4,6 +4,7 @@
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />	4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>	5	</configSections>
6	<runtime>	6	<runtime>
		7	<loadFromRemoteSources enabled="true" />
7	<gcConcurrent enabled="true" />	8	<gcConcurrent enabled="true" />
8	<gcServer enabled="true" />	9	<gcServer enabled="true" />
9	</runtime>	10	</runtime>


diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config index 7aa974c..3a50408 100644 --- a/bin/OpenSim.ConsoleClient.exe.config +++ b/bin/OpenSim.ConsoleClient.exe.config
@@ -4,6 +4,7 @@
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />	4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>	5	</configSections>
6	<runtime>	6	<runtime>
		7	<loadFromRemoteSources enabled="true" />
7	<gcConcurrent enabled="true" />	8	<gcConcurrent enabled="true" />
8	<gcServer enabled="true" />	9	<gcServer enabled="true" />
9	</runtime>	10	</runtime>


diff --git a/bin/OpenSim.Services.exe.config b/bin/OpenSim.Services.exe.config deleted file mode 100644 index c2d93c0..0000000 --- a/bin/OpenSim.Services.exe.config +++ /dev/null
@@ -1,33 +0,0 @@
1	<?xml version="1.0" encoding="utf-8" ?>
2	<configuration>
3	<configSections>
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>
6	<runtime>
7	<gcConcurrent enabled="true" />
8	<gcServer enabled="true" />
9	</runtime>
10	<appSettings>
11	</appSettings>
12	<log4net>
13	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
14	<layout type="log4net.Layout.PatternLayout">
15	<conversionPattern value="%date{HH:mm:ss} - %message%newline" />
16	</layout>
17	</appender>
18
19	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
20	<file value="OpenSim.log" />
21	<appendToFile value="true" />
22	<layout type="log4net.Layout.PatternLayout">
23	<conversionPattern value="%date %-5level - %logger %message%newline" />
24	</layout>
25	</appender>
26
27	<root>
28	<level value="DEBUG" />
29	<appender-ref ref="Console" />
30	<appender-ref ref="LogFileAppender" />
31	</root>
32	</log4net>
33	</configuration>


diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index b2cb4e5..1ec3c9c 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config
@@ -4,6 +4,7 @@
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />	4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>	5	</configSections>
6	<runtime>	6	<runtime>
		7	<loadFromRemoteSources enabled="true" />
7	<gcConcurrent enabled="true" />	8	<gcConcurrent enabled="true" />
8	<gcServer enabled="true" />	9	<gcServer enabled="true" />
9	</runtime>	10	</runtime>


diff --git a/bin/OpenSimExport.exe.config b/bin/OpenSimExport.exe.config deleted file mode 100644 index 3fcb22d..0000000 --- a/bin/OpenSimExport.exe.config +++ /dev/null
@@ -1,28 +0,0 @@
1	<?xml version="1.0" encoding="utf-8" ?>
2	<configuration>
3	<configSections>
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>
6	<appSettings>
7	</appSettings>
8	<log4net>
9	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10	<layout type="log4net.Layout.PatternLayout">
11	<conversionPattern value="%date{HH:mm:ss} - %message%newline" />
12	</layout>
13	</appender>
14	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
15	<file value="OpenSimExport.log" />
16	<appendToFile value="true" />
17	<layout type="log4net.Layout.PatternLayout">
18	<conversionPattern value="%date %-5level - %logger %message%newline" />
19	</layout>
20	</appender>
21
22	<root>
23	<level value="DEBUG" />
24	<appender-ref ref="Console" />
25	<appender-ref ref="LogFileAppender" />
26	</root>
27	</log4net>
28	</configuration>


diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config index ec17049..f2802a2 100644 --- a/bin/Robust.32BitLaunch.exe.config +++ b/bin/Robust.32BitLaunch.exe.config
@@ -4,6 +4,7 @@
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />	4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>	5	</configSections>
6	<runtime>	6	<runtime>
		7	<loadFromRemoteSources enabled="true" />
7	<gcConcurrent enabled="true" />	8	<gcConcurrent enabled="true" />
8	<gcServer enabled="true" />	9	<gcServer enabled="true" />
9	</runtime>	10	</runtime>


diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config index 62975fd..6ffdfef 100644 --- a/bin/Robust.exe.config +++ b/bin/Robust.exe.config
@@ -4,6 +4,7 @@
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />	4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>	5	</configSections>
6	<runtime>	6	<runtime>
		7	<loadFromRemoteSources enabled="true" />
7	<gcConcurrent enabled="true" />	8	<gcConcurrent enabled="true" />
8	<gcServer enabled="true" />	9	<gcServer enabled="true" />
9	</runtime>	10	</runtime>


diff --git a/bin/SimpleApp.exe.config b/bin/SimpleApp.exe.config deleted file mode 100644 index c4d9c22..0000000 --- a/bin/SimpleApp.exe.config +++ /dev/null
@@ -1,28 +0,0 @@
1	<?xml version="1.0" encoding="utf-8" ?>
2	<configuration>
3	<configSections>
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>
6	<appSettings>
7	</appSettings>
8	<log4net>
9	<appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10	<layout type="log4net.Layout.PatternLayout">
11	<conversionPattern value="%date{HH:mm:ss} - %message%newline" />
12	</layout>
13	</appender>
14	<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
15	<file value="SimpleApp.log" />
16	<appendToFile value="true" />
17	<layout type="log4net.Layout.PatternLayout">
18	<conversionPattern value="%date %-5level - %logger %message%newline" />
19	</layout>
20	</appender>
21
22	<root>
23	<level value="DEBUG" />
24	<appender-ref ref="Console" />
25	<appender-ref ref="LogFileAppender" />
26	</root>
27	</log4net>
28	</configuration>


diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config index 9cfb7e9..7912991 100755 --- a/bin/pCampBot.exe.config +++ b/bin/pCampBot.exe.config
@@ -3,6 +3,9 @@
3	<configSections>	3	<configSections>
4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />	4	<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5	</configSections>	5	</configSections>
		6	<runtime>
		7	<loadFromRemoteSources enabled="true" />
		8	</runtime>
6	<appSettings>	9	<appSettings>
7	</appSettings>	10	</appSettings>
8	<log4net>	11	<log4net>