aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-23 01:29:55 +0000
committerJustin Clark-Casey (justincc)2013-11-23 01:29:55 +0000
commitbd5c414618ef7fb02e3e62172c8f2bf7d7964cbf (patch)
tree7d932ecd25c13cbd0795a1e7616ede7a1b65345a
parentAdd line accidentally left out of recent non-root prim sit fix (diff)
downloadopensim-SC_OLD-bd5c414618ef7fb02e3e62172c8f2bf7d7964cbf.zip
opensim-SC_OLD-bd5c414618ef7fb02e3e62172c8f2bf7d7964cbf.tar.gz
opensim-SC_OLD-bd5c414618ef7fb02e3e62172c8f2bf7d7964cbf.tar.bz2
opensim-SC_OLD-bd5c414618ef7fb02e3e62172c8f2bf7d7964cbf.tar.xz
Stop .NET 4 complaining on Windows when it tries to load in DLLs that haven't been marked as trusted in the operating system.
This is done by adding <loadFromRemoteSources enabled="true" /> to the execute *.config files. This tells .NET 4 to trust the DLLs, which is safe in our case since we are not loading DLLs from locations that untrusted users may specify Addresses http://opensimulator.org/mantis/view.php?id=6853 and http://opensimulator.org/mantis/view.php?id=6846 As far as I know, CAS policy checks have never been performed in Mono
-rw-r--r--bin/OpenSim.32BitLaunch.exe.config1
-rw-r--r--bin/OpenSim.ConsoleClient.exe.config1
-rwxr-xr-xbin/OpenSim.exe.config1
-rw-r--r--bin/Robust.32BitLaunch.exe.config1
-rw-r--r--bin/Robust.exe.config1
-rwxr-xr-xbin/pCampBot.exe.config3
6 files changed, 8 insertions, 0 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 @@
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.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/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/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>