Merge branch 'master' of ssh://MyConnection/var/git/opensim

author: Teravus Ovares (Dan Olivares) 2009-08-25 16:13:02 -0400
committer: Teravus Ovares (Dan Olivares) 2009-08-25 16:13:02 -0400
commit: a7917b428a6bc3c9e33da64879b9e473516540a3 (patch)
tree: 2c38d9c33c4977a3d0356912915082a8bd568a23 /bin
parent: Patch from jhurliman to HttpServer (diff)
parent: Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using... (diff)
download: opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.zip
opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.gz
opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.bz2
opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.xz
3 files changed, 3 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 @@
-<Addin id="OpenSim.Grid.AssetInventoryServer" isroot="true" version="0.1">
-    <Runtime>
-        <Import assembly="OpenSim.Grid.AssetInventoryServer.exe" />
-        <Import assembly="OpenSim.Framework.dll" />
-    </Runtime>
-    <ExtensionPoint path="/OpenSim/AssetInventoryServer/Frontend">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAssetInventoryServerPlugin" />
-    </ExtensionPoint>
-    <ExtensionPoint path="/OpenSim/AssetInventoryServer/AssetStorageProvider">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAssetStorageProvider" />
-    </ExtensionPoint>
-    <ExtensionPoint path="/OpenSim/AssetInventoryServer/InventoryStorageProvider">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IInventoryStorageProvider" />
-    </ExtensionPoint>
-    <ExtensionPoint path="/OpenSim/AssetInventoryServer/AuthenticationProvider">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAuthenticationProvider" />
-    </ExtensionPoint>
-    <ExtensionPoint path="/OpenSim/AssetInventoryServer/AuthorizationProvider">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IAuthorizationProvider" />
-    </ExtensionPoint>
-    <ExtensionPoint path="/OpenSim/AssetInventoryServer/MetricsProvider">
-        <ExtensionNode name="Plugin" type="OpenSim.Framework.PluginExtensionNode" objectType="OpenSim.Grid.AssetInventoryServer.IMetricsProvider" />
-    </ExtensionPoint>
-</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 @@
-<?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="OpenSim.Grid.AssetInventoryServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9a17c58..cff5d19 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -374,6 +374,9 @@
    ;
    ; client_socket_rcvbuf_size = 8388608
+    ; Maximum bits per second to send to any single client. This will override the user's viewer preference settings.
+    ; client_throttle_max_bps = 1500000
 [Chat]
    ; Controls whether the chat module is enabled.  Default is true.
author	Teravus Ovares (Dan Olivares)	2009-08-25 16:13:02 -0400
committer	Teravus Ovares (Dan Olivares)	2009-08-25 16:13:02 -0400
commit	a7917b428a6bc3c9e33da64879b9e473516540a3 (patch)
tree	2c38d9c33c4977a3d0356912915082a8bd568a23 /bin
parent	Patch from jhurliman to HttpServer (diff)
parent	Implemented osPenCap, that sets EndCap and StartCap to Pen. This allows using... (diff)
download	opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.zip opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.gz opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.bz2 opensim-SC_OLD-a7917b428a6bc3c9e33da64879b9e473516540a3.tar.xz

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>


diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 9a17c58..cff5d19 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example
@@ -374,6 +374,9 @@
374	;	374	;
375	; client_socket_rcvbuf_size = 8388608	375	; client_socket_rcvbuf_size = 8388608
376		376
		377	; Maximum bits per second to send to any single client. This will override the user's viewer preference settings.
		378
		379	; client_throttle_max_bps = 1500000
377		380
378	[Chat]	381	[Chat]
379	; Controls whether the chat module is enabled. Default is true.	382	; Controls whether the chat module is enabled. Default is true.