diff options
author | Arthur Valadares | 2009-08-25 10:28:22 -0300 |
---|---|---|
committer | Arthur Valadares | 2009-08-25 10:28:22 -0300 |
commit | 9c9fa51b0f005f570df2e3e3b84dfa3974935995 (patch) | |
tree | 49553fb3d3513f826f360eb426e1be7242a92aaf /bin | |
parent | Adds osDrawPolygon to OSSL. Works a little different then other OS Drawing fu... (diff) | |
parent | Closed the web request and stream in SynchronousRestSessionObjectPoster -- ma... (diff) | |
download | opensim-SC_OLD-9c9fa51b0f005f570df2e3e3b84dfa3974935995.zip opensim-SC_OLD-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.gz opensim-SC_OLD-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.bz2 opensim-SC_OLD-9c9fa51b0f005f570df2e3e3b84dfa3974935995.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into arthursv
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.Grid.AssetInventoryServer.addin.xml | 24 | ||||
-rw-r--r-- | bin/OpenSim.Grid.AssetInventoryServer.exe.config | 34 |
2 files changed, 0 insertions, 58 deletions
diff --git a/bin/OpenSim.Grid.AssetInventoryServer.addin.xml b/bin/OpenSim.Grid.AssetInventoryServer.addin.xml deleted file mode 100644 index 1f1bdbd..0000000 --- a/bin/OpenSim.Grid.AssetInventoryServer.addin.xml +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | <Addin id="OpenSim.Grid.AssetInventoryServer" isroot="true" version="0.1"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Grid.AssetInventoryServer.exe" /> | ||
4 | <Import assembly="OpenSim.Framework.dll" /> | ||
5 | </Runtime> | ||
6 | <ExtensionPoint path="/OpenSim/AssetInventoryServer/Frontend"> | ||
7 | <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAssetInventoryServerPlugin" /> | ||
8 | </ExtensionPoint> | ||
9 | <ExtensionPoint path="/OpenSim/AssetInventoryServer/AssetStorageProvider"> | ||
10 | <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAssetStorageProvider" /> | ||
11 | </ExtensionPoint> | ||
12 | <ExtensionPoint path="/OpenSim/AssetInventoryServer/InventoryStorageProvider"> | ||
13 | <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IInventoryStorageProvider" /> | ||
14 | </ExtensionPoint> | ||
15 | <ExtensionPoint path="/OpenSim/AssetInventoryServer/AuthenticationProvider"> | ||
16 | <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAuthenticationProvider" /> | ||
17 | </ExtensionPoint> | ||
18 | <ExtensionPoint path="/OpenSim/AssetInventoryServer/AuthorizationProvider"> | ||
19 | <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAuthorizationProvider" /> | ||
20 | </ExtensionPoint> | ||
21 | <ExtensionPoint path="/OpenSim/AssetInventoryServer/MetricsProvider"> | ||
22 | <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IMetricsProvider" /> | ||
23 | </ExtensionPoint> | ||
24 | </Addin> | ||
diff --git a/bin/OpenSim.Grid.AssetInventoryServer.exe.config b/bin/OpenSim.Grid.AssetInventoryServer.exe.config deleted file mode 100644 index e542cf2..0000000 --- a/bin/OpenSim.Grid.AssetInventoryServer.exe.config +++ /dev/null | |||
@@ -1,34 +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="OpenSim.Grid.AssetInventoryServer.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 | <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" --> | ||
23 | <logger name="NHibernate" additivity="false"> | ||
24 | <level value="INFO"/> | ||
25 | <appender-ref ref="NHibernateFileLog"/> | ||
26 | </logger> | ||
27 | |||
28 | <root> | ||
29 | <level value="DEBUG" /> | ||
30 | <appender-ref ref="Console" /> | ||
31 | <appender-ref ref="LogFileAppender" /> | ||
32 | </root> | ||
33 | </log4net> | ||
34 | </configuration> | ||