diff options
author | David Walter Seikel | 2016-11-04 00:46:34 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-04 00:46:34 +1000 |
commit | 58783a5216b81863988110174229a65ceb315e1e (patch) | |
tree | 74d08dcd7e127f288cd7a8026c776385a738d484 /bin | |
parent | Even OpenSim removed the silly IAR avatar presence check. Purge it with fire. (diff) | |
download | opensim-SC-58783a5216b81863988110174229a65ceb315e1e.zip opensim-SC-58783a5216b81863988110174229a65ceb315e1e.tar.gz opensim-SC-58783a5216b81863988110174229a65ceb315e1e.tar.bz2 opensim-SC-58783a5216b81863988110174229a65ceb315e1e.tar.xz |
Attempt to move everything writable, and the configs, out of the bin directory.
Log configs are still in the bin directory.
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.32BitLaunch.exe.config | 6 | ||||
-rw-r--r-- | bin/OpenSim.ConsoleClient.exe.config | 2 | ||||
-rwxr-xr-x | bin/OpenSim.exe.config | 6 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 4 | ||||
-rw-r--r-- | bin/Robust.32BitLaunch.exe.config | 6 | ||||
-rw-r--r-- | bin/Robust.Tests.dll.config | 2 | ||||
-rw-r--r-- | bin/Robust.exe.config | 6 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini | 300 | ||||
-rwxr-xr-x | bin/pCampBot.exe.config | 4 | ||||
-rw-r--r-- | config/OpenSimDefaults.ini (renamed from bin/OpenSimDefaults.ini) | 2 | ||||
-rw-r--r-- | config/config-include/CenomeCache.ini.example (renamed from bin/config-include/CenomeCache.ini.example) | 0 | ||||
-rw-r--r-- | config/config-include/FlotsamCache.ini.example (renamed from bin/config-include/FlotsamCache.ini.example) | 2 | ||||
-rw-r--r-- | config/config-include/Grid.ini (renamed from bin/config-include/Grid.ini) | 0 | ||||
-rw-r--r-- | config/config-include/GridCommon.ini.example (renamed from bin/config-include/GridCommon.ini.example) | 0 | ||||
-rw-r--r-- | config/config-include/GridHypergrid.ini (renamed from bin/config-include/GridHypergrid.ini) | 0 | ||||
-rw-r--r-- | config/config-include/HyperSimianGrid.ini (renamed from bin/config-include/HyperSimianGrid.ini) | 0 | ||||
-rw-r--r-- | config/config-include/SimianGrid.ini (renamed from bin/config-include/SimianGrid.ini) | 0 | ||||
-rw-r--r-- | config/config-include/Standalone.ini (renamed from bin/config-include/Standalone.ini) | 0 | ||||
-rw-r--r-- | config/config-include/StandaloneCommon.ini.example (renamed from bin/config-include/StandaloneCommon.ini.example) | 0 | ||||
-rw-r--r-- | config/config-include/StandaloneHypergrid.ini (renamed from bin/config-include/StandaloneHypergrid.ini) | 0 | ||||
-rw-r--r-- | config/config-include/osslEnable.ini (renamed from bin/config-include/osslEnable.ini) | 0 | ||||
-rw-r--r-- | config/config-include/storage/SQLiteStandalone.ini (renamed from bin/config-include/storage/SQLiteStandalone.ini) | 20 |
22 files changed, 30 insertions, 330 deletions
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config index 5b7807a..db08aeb 100644 --- a/bin/OpenSim.32BitLaunch.exe.config +++ b/bin/OpenSim.32BitLaunch.exe.config | |||
@@ -25,14 +25,14 @@ | |||
25 | 25 | ||
26 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | 26 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: |
27 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | 27 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> |
28 | <file value="log/OpenSim.32BitLaunch.log" /> | 28 | <file value="../logs/OpenSim.32BitLaunch.log" /> |
29 | <rollingStyle value="Date" /> | 29 | <rollingStyle value="Date" /> |
30 | <datePattern value="'.'yyyy-MM-dd"/> | 30 | <datePattern value="'.'yyyy-MM-dd"/> |
31 | ... | 31 | ... |
32 | --> | 32 | --> |
33 | 33 | ||
34 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 34 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |
35 | <file value="OpenSim.32BitLaunch.log" /> | 35 | <file value="../logs/OpenSim.32BitLaunch.log" /> |
36 | <appendToFile value="true" /> | 36 | <appendToFile value="true" /> |
37 | <filter type="log4net.Filter.LoggerMatchFilter"> | 37 | <filter type="log4net.Filter.LoggerMatchFilter"> |
38 | <loggerToMatch value="special"/> | 38 | <loggerToMatch value="special"/> |
@@ -44,7 +44,7 @@ | |||
44 | </appender> | 44 | </appender> |
45 | 45 | ||
46 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | 46 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> |
47 | <file value="OpenSimStats.log"/> | 47 | <file value="../logs/OpenSimStats.log"/> |
48 | <appendToFile value="true" /> | 48 | <appendToFile value="true" /> |
49 | <layout type="log4net.Layout.PatternLayout"> | 49 | <layout type="log4net.Layout.PatternLayout"> |
50 | <conversionPattern value="%date - %message%newline" /> | 50 | <conversionPattern value="%date - %message%newline" /> |
diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config index 3a50408..9098a94 100644 --- a/bin/OpenSim.ConsoleClient.exe.config +++ b/bin/OpenSim.ConsoleClient.exe.config | |||
@@ -18,7 +18,7 @@ | |||
18 | </appender> | 18 | </appender> |
19 | 19 | ||
20 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 20 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |
21 | <file value="OpenSim.ConsoleClient.log" /> | 21 | <file value="../logs/OpenSim.ConsoleClient.log" /> |
22 | <appendToFile value="true" /> | 22 | <appendToFile value="true" /> |
23 | <layout type="log4net.Layout.PatternLayout"> | 23 | <layout type="log4net.Layout.PatternLayout"> |
24 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | 24 | <conversionPattern value="%date %-5level - %logger %message%newline" /> |
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index b01191e..2556e11 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config | |||
@@ -25,14 +25,14 @@ | |||
25 | 25 | ||
26 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | 26 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: |
27 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | 27 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> |
28 | <file value="log/OpenSim.log" /> | 28 | <file value="../logs/OpenSim.log" /> |
29 | <rollingStyle value="Date" /> | 29 | <rollingStyle value="Date" /> |
30 | <datePattern value="'.'yyyy-MM-dd"/> | 30 | <datePattern value="'.'yyyy-MM-dd"/> |
31 | ... | 31 | ... |
32 | --> | 32 | --> |
33 | 33 | ||
34 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 34 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |
35 | <file value="OpenSim.log" /> | 35 | <file value="../logs/OpenSim.log" /> |
36 | <appendToFile value="true" /> | 36 | <appendToFile value="true" /> |
37 | <filter type="log4net.Filter.LoggerMatchFilter"> | 37 | <filter type="log4net.Filter.LoggerMatchFilter"> |
38 | <loggerToMatch value="special"/> | 38 | <loggerToMatch value="special"/> |
@@ -44,7 +44,7 @@ | |||
44 | </appender> | 44 | </appender> |
45 | 45 | ||
46 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | 46 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> |
47 | <file value="OpenSimStats.log"/> | 47 | <file value="../logs/OpenSimStats.log"/> |
48 | <appendToFile value="true" /> | 48 | <appendToFile value="true" /> |
49 | <layout type="log4net.Layout.PatternLayout"> | 49 | <layout type="log4net.Layout.PatternLayout"> |
50 | <conversionPattern value="%date - %message%newline" /> | 50 | <conversionPattern value="%date - %message%newline" /> |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index d395efe..07ed21d 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -901,7 +901,7 @@ | |||
901 | ;; co-op will be more stable but this option is currently experimental. | 901 | ;; co-op will be more stable but this option is currently experimental. |
902 | ;; If moving from co-op to abort, existing script DLLs will need to be recompiled. | 902 | ;; If moving from co-op to abort, existing script DLLs will need to be recompiled. |
903 | ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run | 903 | ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run |
904 | ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/ | 904 | ;; or by deleting the script DLL* files in caches/ScriptEngines/<region-id>/ |
905 | ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile | 905 | ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile |
906 | ;; Current valid values are "abort" and "co-op" | 906 | ;; Current valid values are "abort" and "co-op" |
907 | ; ScriptStopStrategy = abort | 907 | ; ScriptStopStrategy = abort |
@@ -966,7 +966,7 @@ | |||
966 | 966 | ||
967 | ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines | 967 | ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines |
968 | ;; Path to script engine assemblies | 968 | ;; Path to script engine assemblies |
969 | ;; Default is ./bin/ScriptEngines | 969 | ;; Default is ../caches/ScriptEngines |
970 | ; ScriptEnginesPath = "ScriptEngines" | 970 | ; ScriptEnginesPath = "ScriptEngines" |
971 | 971 | ||
972 | [OSSL] | 972 | [OSSL] |
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config index 0399a1b..8706574 100644 --- a/bin/Robust.32BitLaunch.exe.config +++ b/bin/Robust.32BitLaunch.exe.config | |||
@@ -23,14 +23,14 @@ | |||
23 | 23 | ||
24 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | 24 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: |
25 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | 25 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> |
26 | <file value="log/Robust.32BitLaunch.log" /> | 26 | <file value="../logs/Robust.32BitLaunch.log" /> |
27 | <rollingStyle value="Date" /> | 27 | <rollingStyle value="Date" /> |
28 | <datePattern value="'.'yyyy-MM-dd"/> | 28 | <datePattern value="'.'yyyy-MM-dd"/> |
29 | ... | 29 | ... |
30 | --> | 30 | --> |
31 | 31 | ||
32 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 32 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |
33 | <file value="Robust.32BitLaunch.log" /> | 33 | <file value=../logs/"Robust.32BitLaunch.log" /> |
34 | <appendToFile value="true" /> | 34 | <appendToFile value="true" /> |
35 | <filter type="log4net.Filter.LoggerMatchFilter"> | 35 | <filter type="log4net.Filter.LoggerMatchFilter"> |
36 | <loggerToMatch value="special"/> | 36 | <loggerToMatch value="special"/> |
@@ -42,7 +42,7 @@ | |||
42 | </appender> | 42 | </appender> |
43 | 43 | ||
44 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | 44 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> |
45 | <file value="RobustStats.log"/> | 45 | <file value="../logs/RobustStats.log"/> |
46 | <appendToFile value="true" /> | 46 | <appendToFile value="true" /> |
47 | <layout type="log4net.Layout.PatternLayout"> | 47 | <layout type="log4net.Layout.PatternLayout"> |
48 | <conversionPattern value="%date - %message%newline" /> | 48 | <conversionPattern value="%date - %message%newline" /> |
diff --git a/bin/Robust.Tests.dll.config b/bin/Robust.Tests.dll.config index a4c43e7..dc62ae0 100644 --- a/bin/Robust.Tests.dll.config +++ b/bin/Robust.Tests.dll.config | |||
@@ -22,7 +22,7 @@ | |||
22 | </appender> | 22 | </appender> |
23 | 23 | ||
24 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 24 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |
25 | <file value="Robust.Tests.log" /> | 25 | <file value="../logs/Robust.Tests.log" /> |
26 | <appendToFile value="true" /> | 26 | <appendToFile value="true" /> |
27 | <filter type="log4net.Filter.LoggerMatchFilter"> | 27 | <filter type="log4net.Filter.LoggerMatchFilter"> |
28 | <loggerToMatch value="special"/> | 28 | <loggerToMatch value="special"/> |
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config index 7db6458..196602e 100644 --- a/bin/Robust.exe.config +++ b/bin/Robust.exe.config | |||
@@ -23,14 +23,14 @@ | |||
23 | 23 | ||
24 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | 24 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: |
25 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | 25 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> |
26 | <file value="log/Robust.log" /> | 26 | <file value="../logs/Robust.log" /> |
27 | <rollingStyle value="Date" /> | 27 | <rollingStyle value="Date" /> |
28 | <datePattern value="'.'yyyy-MM-dd"/> | 28 | <datePattern value="'.'yyyy-MM-dd"/> |
29 | ... | 29 | ... |
30 | --> | 30 | --> |
31 | 31 | ||
32 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 32 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |
33 | <file value="Robust.log" /> | 33 | <file value="../logs/Robust.log" /> |
34 | <appendToFile value="true" /> | 34 | <appendToFile value="true" /> |
35 | <filter type="log4net.Filter.LoggerMatchFilter"> | 35 | <filter type="log4net.Filter.LoggerMatchFilter"> |
36 | <loggerToMatch value="special"/> | 36 | <loggerToMatch value="special"/> |
@@ -42,7 +42,7 @@ | |||
42 | </appender> | 42 | </appender> |
43 | 43 | ||
44 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | 44 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> |
45 | <file value="RobustStats.log"/> | 45 | <file value="../logs/RobustStats.log"/> |
46 | <appendToFile value="true" /> | 46 | <appendToFile value="true" /> |
47 | <layout type="log4net.Layout.PatternLayout"> | 47 | <layout type="log4net.Layout.PatternLayout"> |
48 | <conversionPattern value="%date - %message%newline" /> | 48 | <conversionPattern value="%date - %message%newline" /> |
diff --git a/bin/config-include/GridCommon.ini b/bin/config-include/GridCommon.ini deleted file mode 100644 index 58d921a..0000000 --- a/bin/config-include/GridCommon.ini +++ /dev/null | |||
@@ -1,300 +0,0 @@ | |||
1 | ; This is the main configuration file for an instance of OpenSim running in grid mode | ||
2 | ; In particular, this one is set up for connecting to Infinite Grid. | ||
3 | |||
4 | [DatabaseService] | ||
5 | ; | ||
6 | ; ### Choose the DB | ||
7 | ; | ||
8 | ; NOTE - both are commented out, you'l have to choose one yourself. | ||
9 | ; | ||
10 | |||
11 | ; SQLite | ||
12 | ; Include-Storage = "config-include/storage/SQLiteStandalone.ini"; | ||
13 | |||
14 | ; MySql | ||
15 | ; Uncomment these lines if you want to use mysql storage | ||
16 | ; Change the connection string to your db details | ||
17 | ;StorageProvider = "OpenSim.Data.MySQL.dll" | ||
18 | ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" | ||
19 | ; Uncomment this line if you are using MySQL and want to use a different database for estates | ||
20 | ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database. | ||
21 | ; Most people won't need to do this so only uncomment if you know what you're doing. | ||
22 | ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" | ||
23 | |||
24 | ; MSSQL | ||
25 | ; Uncomment these lines if you want to use MSSQL storage | ||
26 | ; Change the connection string to your db details | ||
27 | ; The value for server property is shown in your SQL Server Management Studio login dialog. | ||
28 | ; (This sample is the default of express edition) | ||
29 | ;StorageProvider = "OpenSim.Data.MSSQL.dll" | ||
30 | ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" | ||
31 | |||
32 | [Modules] | ||
33 | ;; Choose one cache module and the corresponding config file, if it exists. | ||
34 | ;; Copy the config .example file into your own .ini file and adapt that. | ||
35 | ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained. | ||
36 | |||
37 | AssetCaching = "FlotsamAssetCache" | ||
38 | Include-FlotsamCache = "config-include/FlotsamCache.ini" | ||
39 | |||
40 | ;AssetCaching = "CenomeMemoryAssetCache" | ||
41 | ;Include-CenomeCache = "config-include/CenomeCache.ini" | ||
42 | |||
43 | ;AssetCaching = "GlynnTuckerAssetCache" | ||
44 | |||
45 | ;; Optionally, the port for the LLProxyLoginModule module can be changed | ||
46 | ;Setup_LLProxyLoginModule = "9090/" | ||
47 | |||
48 | ;; Authorization is not on by default, as it depends on external php | ||
49 | ;AuthorizationServices = "RemoteAuthorizationServicesConnector" | ||
50 | |||
51 | ;; To allow the Teleport and Show on Map buttons to work properly (for search | ||
52 | ;; results containing locations). From ossearch module. | ||
53 | LandServices = "RemoteLandServicesConnector" | ||
54 | LandServiceInConnector = "true" | ||
55 | |||
56 | [AssetService] | ||
57 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | ||
58 | AssetLoaderArgs = "assets/AssetSets.xml" | ||
59 | |||
60 | ; | ||
61 | ; Change this to your grid-wide asset server. Do not add a slash to the end of any of these addresses. | ||
62 | ; | ||
63 | AssetServerURI = "http://grid.infinitegrid.org:8003" | ||
64 | |||
65 | [InventoryService] | ||
66 | ; | ||
67 | ; Change this to your grid-wide inventory server | ||
68 | ; | ||
69 | InventoryServerURI = "http://grid.infinitegrid.org:8003" | ||
70 | |||
71 | [GridInfo] | ||
72 | ; | ||
73 | ; Change this to your grid info service | ||
74 | ; | ||
75 | GridInfoURI = "http://grid.infinitegrid.org:8002" | ||
76 | |||
77 | [GridService] | ||
78 | ; | ||
79 | ; Change this to your grid-wide grid server | ||
80 | ; | ||
81 | GridServerURI = "http://grid.infinitegrid.org:8003" | ||
82 | AllowHypergridMapSearch = true | ||
83 | |||
84 | ;; Directory for map tile images of linked regions | ||
85 | ; MapTileDirectory = "./maptiles" | ||
86 | MapTileDirectory = "caches/maptiles" | ||
87 | |||
88 | ; === HG ONLY === | ||
89 | ;; Change this to the address of your Gatekeeper service | ||
90 | ;; (usually bundled with the rest of the services in one | ||
91 | ;; Robust server in port 8002, but not always) | ||
92 | Gatekeeper="http://grid.infinitegrid.org:8002" | ||
93 | |||
94 | [Messaging] | ||
95 | ; === HG ONLY === | ||
96 | ;; Change this to the address of your Gatekeeper service | ||
97 | ;; (usually bundled with the rest of the services in one | ||
98 | ;; Robust server in port 8002, but not always) | ||
99 | Gatekeeper = "http://grid.infinitegrid.org:8002" | ||
100 | |||
101 | [AvatarService] | ||
102 | ; | ||
103 | ; Change this to your grid-wide grid server | ||
104 | ; | ||
105 | AvatarServerURI = "http://grid.infinitegrid.org:8003" | ||
106 | |||
107 | [PresenceService] | ||
108 | ; | ||
109 | ; Change this to your grid-wide presence server | ||
110 | ; | ||
111 | PresenceServerURI = "http://grid.infinitegrid.org:8003" | ||
112 | |||
113 | [UserAccountService] | ||
114 | ; | ||
115 | ; Change this to your grid-wide user accounts server | ||
116 | ; | ||
117 | UserAccountServerURI = "http://grid.infinitegrid.org:8003" | ||
118 | |||
119 | [GridUserService] | ||
120 | ; | ||
121 | ; Change this to your grid-wide user accounts server | ||
122 | ; | ||
123 | GridUserServerURI = "http://grid.infinitegrid.org:8003" | ||
124 | |||
125 | [AuthenticationService] | ||
126 | ; | ||
127 | ; Change this to your grid-wide authentication server | ||
128 | ; | ||
129 | AuthenticationServerURI = "http://grid.infinitegrid.org:8003" | ||
130 | |||
131 | [FriendsService] | ||
132 | ; | ||
133 | ; Change this to your grid-wide friends server | ||
134 | ; | ||
135 | FriendsServerURI = "http://grid.infinitegrid.org:8003" | ||
136 | |||
137 | [HGInventoryAccessModule] | ||
138 | ; | ||
139 | ; === HG ONLY === | ||
140 | ; Change this to your server | ||
141 | ; accessible from other grids | ||
142 | ; | ||
143 | HomeURI = "http://grid.infinitegrid.org:8002" | ||
144 | Gatekeeper = "http://grid.infinitegrid.org:8002" | ||
145 | ;; If you want to protect your assets from being copied by foreign visitors | ||
146 | ;; uncomment the next line. You may want to do this on sims that have licensed content. | ||
147 | OutboundPermission = True | ||
148 | |||
149 | ;; Send visual reminder to local users that their inventories are unavailable while they are traveling | ||
150 | ;; and available when they return. True by default. | ||
151 | ;RestrictInventoryAccessAbroad = True | ||
152 | |||
153 | |||
154 | [HGAssetService] | ||
155 | ; | ||
156 | ; === HG ONLY === | ||
157 | ; Change this to your server | ||
158 | ; accessible from other grids | ||
159 | ; | ||
160 | HomeURI = "http://grid.infinitegrid.org:8002" | ||
161 | |||
162 | ;; The asset types that this grid can export to / import from other grids. | ||
163 | ;; Comma separated. | ||
164 | ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: | ||
165 | ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, | ||
166 | ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh | ||
167 | ;; | ||
168 | ;; Leave blank or commented if you don't want to apply any restrictions. | ||
169 | ;; A more strict, but still reasonable, policy may be to disallow the exchange | ||
170 | ;; of scripts, like so: | ||
171 | ; DisallowExport ="LSLText" | ||
172 | ; DisallowImport ="LSLBytecode" | ||
173 | |||
174 | [HGFriendsModule] | ||
175 | ; User level required to be able to send friendship invitations to foreign users | ||
176 | LevelHGFriends = 0; | ||
177 | |||
178 | [UserAgentService] | ||
179 | ; | ||
180 | ; === HG ONLY === | ||
181 | ; Change this to your user agent server (HG robust) | ||
182 | ; | ||
183 | UserAgentServerURI = "http://grid.infinitegrid.org:8002" | ||
184 | |||
185 | [MapImageService] | ||
186 | MapImageServerURI = "http://grid.infinitegrid.org:8003" | ||
187 | |||
188 | [AuthorizationService] | ||
189 | ; If you have regions with access restrictions | ||
190 | ; specify them here using the convention | ||
191 | ; Region_<Region_Name> = <flags> | ||
192 | ; Valid flags are: | ||
193 | ; DisallowForeigners -- HG visitors not allowed | ||
194 | ; DisallowResidents -- only Admins and Managers allowed | ||
195 | ; Example: | ||
196 | ; Region_Test_1 = "DisallowForeigners" | ||
197 | |||
198 | |||
199 | ;; From the original IG version - | ||
200 | [Profile] | ||
201 | ProfileURL = http://www.infinitegrid.org/opensim/profile.php | ||
202 | |||
203 | |||
204 | [Search] | ||
205 | SearchURL = http://www.infinitegrid.org/opensim/query.php | ||
206 | |||
207 | |||
208 | [DataSnapshot] | ||
209 | ;# {gridname} {index_sims:true} {Enter the name fo your grid} {} OSGrid | ||
210 | ;; If search is on, change this to your grid name; will be ignored for | ||
211 | ;; standalones | ||
212 | gridname = "InfiniteGrid" | ||
213 | |||
214 | ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py | ||
215 | ; This semicolon-separated string serves to notify specific data services | ||
216 | ; about the existence of this sim. Uncomment if you want to index your | ||
217 | ; data with this and/or other search providers. | ||
218 | data_services="http://www.infinitegrid.org/opensim/register.php" | ||
219 | |||
220 | |||
221 | [Messaging] | ||
222 | ;; From the original IG version - | ||
223 | InstantMessageModule = InstantMessageModule | ||
224 | ; MessageTransferModule = MessageTransferModule | ||
225 | ; MuteListModule = NSLMuteListModule | ||
226 | |||
227 | ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule *} | ||
228 | ;; Module to handle offline messaging. The core module requires an external | ||
229 | ;; web service to do this. See OpenSim wiki. | ||
230 | OfflineMessageModule = OfflineMessageModule | ||
231 | |||
232 | ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule} {URL of offline messaging service} {} | ||
233 | ;; URL of web service for offline message storage | ||
234 | OfflineMessageURL = http://www.infinitegrid.org/opensim/offline.php | ||
235 | |||
236 | ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule | ||
237 | ;; Mute list handler (not yet implemented). MUST BE SET to allow offline | ||
238 | ;; messages to work | ||
239 | MuteListModule = MuteListModule | ||
240 | |||
241 | ;# {MuteListURL} {OfflineMessageModule:OfflineMessageModule} {} {} http://yourserver/Mute.php | ||
242 | ;; URL of the web service that serves mute lists. Not currently used, but | ||
243 | ;; must be set to allow offline messaging to work. | ||
244 | MuteListURL = http://www.infinitegrid.org/opensim/mute.php | ||
245 | |||
246 | ;; Control whether group messages are forwarded to offline users. | ||
247 | ;; Default is true. | ||
248 | ;; This applies to the core groups module (Flotsam) only. | ||
249 | ForwardOfflineGroupMessages = false | ||
250 | |||
251 | |||
252 | [Groups] | ||
253 | ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {} Default | ||
254 | ;; This is the current groups stub in Region.CoreModules.Avatar.Groups. | ||
255 | ;; All the other settings below only really apply to the Flotsam/SimianGrid | ||
256 | ;; GroupsModule. | ||
257 | ;; This module can use a PHP XmlRpc server from the Flotsam project at | ||
258 | ;; http://code.google.com/p/flotsam/ | ||
259 | ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse | ||
260 | ; Module = Default | ||
261 | Module = GroupsModule | ||
262 | |||
263 | ;# {MessagingEnabled} {Module:GroupsModule} {Is groups messaging enabled?} {true false} true | ||
264 | MessagingEnabled = true | ||
265 | |||
266 | ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule} GroupsMessagingModule | ||
267 | MessagingModule = GroupsMessagingModule | ||
268 | |||
269 | ; Experimental option to only message cached online users rather than all users | ||
270 | ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service | ||
271 | ; This currently only applies to the Flotsam XmlRpc backend | ||
272 | MessageOnlineUsersOnly = true | ||
273 | |||
274 | ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector | ||
275 | ;; Service connectors to the Groups Service as used in the GroupsModule. Select one depending on | ||
276 | ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend | ||
277 | ServicesConnectorModule = XmlRpcGroupsServicesConnector | ||
278 | |||
279 | ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {} | ||
280 | ;; URI for the groups services | ||
281 | ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc | ||
282 | ;; or http://mygridserver.com:82/Grid/ for SimianGrid | ||
283 | GroupsServerURI = "http://www.infinitegrid.org/opensim/xmlrpc.php" | ||
284 | |||
285 | ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true | ||
286 | ;; Enable Group Notices | ||
287 | NoticesEnabled = true | ||
288 | |||
289 | ;; This makes the Groups modules very chatty on the console. | ||
290 | DebugEnabled = false | ||
291 | |||
292 | ;; XmlRpc Security settings. These must match those set on your backend | ||
293 | ;; groups service if the service is using these keys | ||
294 | XmlRpcServiceReadKey = Uffmzl93xvrZK1w6KWeMg25pls8zWBr7hhibNDqzVy8qH4J | ||
295 | XmlRpcServiceWriteKey = sgJfEs4nzRJ4GLlLGTRIqIYW6SPlUiu4MtauZkcmReuZaYh | ||
296 | |||
297 | [Includes] | ||
298 | |||
299 | ;; This is an example, you'll need to provide your own. | ||
300 | Include-Common = config/database.ini | ||
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config index f017309..7ccc3ce 100755 --- a/bin/pCampBot.exe.config +++ b/bin/pCampBot.exe.config | |||
@@ -19,7 +19,7 @@ | |||
19 | </layout> | 19 | </layout> |
20 | </appender> | 20 | </appender> |
21 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | 21 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> |
22 | <file value="pCampBot.log" /> | 22 | <file value="../logs/pCampBot.log" /> |
23 | <appendToFile value="true" /> | 23 | <appendToFile value="true" /> |
24 | <filter type="log4net.Filter.LoggerMatchFilter"> | 24 | <filter type="log4net.Filter.LoggerMatchFilter"> |
25 | <loggerToMatch value="special"/> | 25 | <loggerToMatch value="special"/> |
@@ -31,7 +31,7 @@ | |||
31 | </appender> | 31 | </appender> |
32 | 32 | ||
33 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | 33 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> |
34 | <file value="pCampBotStats.log"/> | 34 | <file value="../logs/pCampBotStats.log"/> |
35 | <appendToFile value="true" /> | 35 | <appendToFile value="true" /> |
36 | <layout type="log4net.Layout.PatternLayout"> | 36 | <layout type="log4net.Layout.PatternLayout"> |
37 | <conversionPattern value="%date - %message%newline" /> | 37 | <conversionPattern value="%date - %message%newline" /> |
diff --git a/bin/OpenSimDefaults.ini b/config/OpenSimDefaults.ini index a99608c..7ed31d4 100644 --- a/bin/OpenSimDefaults.ini +++ b/config/OpenSimDefaults.ini | |||
@@ -13,7 +13,7 @@ | |||
13 | ConsoleHistoryFileEnabled = true | 13 | ConsoleHistoryFileEnabled = true |
14 | 14 | ||
15 | ; Log file location. This can be set to a simple file path | 15 | ; Log file location. This can be set to a simple file path |
16 | ; LogFile = OpenSim.log | 16 | ; LogFile = "../logs/OpenSim.log |
17 | 17 | ||
18 | ; The history file can be just a filename (relative to OpenSim's bin/ directory | 18 | ; The history file can be just a filename (relative to OpenSim's bin/ directory |
19 | ; or it can be a full path to somewhere else. (default is OpenSimConsoleHistory.txt in bin/) | 19 | ; or it can be a full path to somewhere else. (default is OpenSimConsoleHistory.txt in bin/) |
diff --git a/bin/config-include/CenomeCache.ini.example b/config/config-include/CenomeCache.ini.example index 4340493..4340493 100644 --- a/bin/config-include/CenomeCache.ini.example +++ b/config/config-include/CenomeCache.ini.example | |||
diff --git a/bin/config-include/FlotsamCache.ini.example b/config/config-include/FlotsamCache.ini.example index ad74fc1..c166523 100644 --- a/bin/config-include/FlotsamCache.ini.example +++ b/config/config-include/FlotsamCache.ini.example | |||
@@ -4,7 +4,7 @@ | |||
4 | ;; | 4 | ;; |
5 | 5 | ||
6 | ; cache directory can be shared by multiple instances | 6 | ; cache directory can be shared by multiple instances |
7 | CacheDirectory = ./assetcache | 7 | CacheDirectory = ../caches/assetcache |
8 | ; Other examples: | 8 | ; Other examples: |
9 | ;CacheDirectory = /directory/writable/by/OpenSim/instance | 9 | ;CacheDirectory = /directory/writable/by/OpenSim/instance |
10 | 10 | ||
diff --git a/bin/config-include/Grid.ini b/config/config-include/Grid.ini index 3c61ee0..3c61ee0 100644 --- a/bin/config-include/Grid.ini +++ b/config/config-include/Grid.ini | |||
diff --git a/bin/config-include/GridCommon.ini.example b/config/config-include/GridCommon.ini.example index 0922cf5..0922cf5 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/config/config-include/GridCommon.ini.example | |||
diff --git a/bin/config-include/GridHypergrid.ini b/config/config-include/GridHypergrid.ini index 602d673..602d673 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/config/config-include/GridHypergrid.ini | |||
diff --git a/bin/config-include/HyperSimianGrid.ini b/config/config-include/HyperSimianGrid.ini index efad577..efad577 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/config/config-include/HyperSimianGrid.ini | |||
diff --git a/bin/config-include/SimianGrid.ini b/config/config-include/SimianGrid.ini index 5749656..5749656 100644 --- a/bin/config-include/SimianGrid.ini +++ b/config/config-include/SimianGrid.ini | |||
diff --git a/bin/config-include/Standalone.ini b/config/config-include/Standalone.ini index 78ada2b..78ada2b 100644 --- a/bin/config-include/Standalone.ini +++ b/config/config-include/Standalone.ini | |||
diff --git a/bin/config-include/StandaloneCommon.ini.example b/config/config-include/StandaloneCommon.ini.example index d0b152c..d0b152c 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/config/config-include/StandaloneCommon.ini.example | |||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/config/config-include/StandaloneHypergrid.ini index eaacfff..eaacfff 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/config/config-include/StandaloneHypergrid.ini | |||
diff --git a/bin/config-include/osslEnable.ini b/config/config-include/osslEnable.ini index 0a03d4c..0a03d4c 100644 --- a/bin/config-include/osslEnable.ini +++ b/config/config-include/osslEnable.ini | |||
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/config/config-include/storage/SQLiteStandalone.ini index 67d98ff..14051cc 100644 --- a/bin/config-include/storage/SQLiteStandalone.ini +++ b/config/config-include/storage/SQLiteStandalone.ini | |||
@@ -2,10 +2,10 @@ | |||
2 | 2 | ||
3 | [DatabaseService] | 3 | [DatabaseService] |
4 | StorageProvider = "OpenSim.Data.SQLite.dll" | 4 | StorageProvider = "OpenSim.Data.SQLite.dll" |
5 | ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True" | 5 | ConnectionString = "URI=file:../db/OpenSim.db,version=3,UseUTF16Encoding=True" |
6 | 6 | ||
7 | [AssetService] | 7 | [AssetService] |
8 | ConnectionString = "URI=file:Asset.db,version=3" | 8 | ConnectionString = "URI=file:../db/Asset.db,version=3" |
9 | 9 | ||
10 | ; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration. | 10 | ; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration. |
11 | ; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead. | 11 | ; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead. |
@@ -15,25 +15,25 @@ | |||
15 | ; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and | 15 | ; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and |
16 | ; do not have separate connection strings for different services. | 16 | ; do not have separate connection strings for different services. |
17 | [HGAssetService] | 17 | [HGAssetService] |
18 | ConnectionString = "URI=file:Asset.db,version=3" | 18 | ConnectionString = "URI=file:../db/Asset.db,version=3" |
19 | 19 | ||
20 | [InventoryService] | 20 | [InventoryService] |
21 | ;ConnectionString = "URI=file:inventory.db,version=3" | 21 | ;ConnectionString = "URI=file:../db/inventory.db,version=3" |
22 | ; if you have a legacy inventory store use the connection string below | 22 | ; if you have a legacy inventory store use the connection string below |
23 | ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True" | 23 | ConnectionString = "URI=file:../db/inventory.db,version=3,UseUTF16Encoding=True" |
24 | 24 | ||
25 | [AvatarService] | 25 | [AvatarService] |
26 | ConnectionString = "URI=file:avatars.db,version=3" | 26 | ConnectionString = "URI=file:../db/avatars.db,version=3" |
27 | 27 | ||
28 | [AuthenticationService] | 28 | [AuthenticationService] |
29 | ConnectionString = "URI=file:auth.db,version=3" | 29 | ConnectionString = "URI=file:../db/auth.db,version=3" |
30 | 30 | ||
31 | [UserAccountService] | 31 | [UserAccountService] |
32 | ConnectionString = "URI=file:userprofiles.db,version=3" | 32 | ConnectionString = "URI=file:../db/userprofiles.db,version=3" |
33 | 33 | ||
34 | [GridUserService] | 34 | [GridUserService] |
35 | ConnectionString = "URI=file:griduser.db,version=3" | 35 | ConnectionString = "URI=file:../db/griduser.db,version=3" |
36 | 36 | ||
37 | [FriendsService] | 37 | [FriendsService] |
38 | ConnectionString = "URI=file:friends.db,version=3" | 38 | ConnectionString = "URI=file:../db/friends.db,version=3" |
39 | 39 | ||