aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/Ionic.Zip.dllbin0 -> 462336 bytes
-rw-r--r--bin/OpenSim.Framework.Serialization.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config33
-rw-r--r--bin/OpenSim.Region.OptionalModules.Tests.dll.config33
-rw-r--r--bin/OpenSim.Tests.Torture.dll.config33
-rwxr-xr-xbin/OpenSim.exe.config5
-rw-r--r--[-rwxr-xr-x]bin/OpenSim.ini.example135
-rw-r--r--bin/OpenSimDefaults.ini80
-rwxr-xr-xbin/PrimMesher.dllbin37376 -> 46592 bytes
-rw-r--r--bin/Robust.HG.ini.example42
-rw-r--r--bin/Robust.ini.example41
-rw-r--r--bin/config-include/FlotsamCache.ini.example4
-rw-r--r--bin/config-include/Grid.ini3
-rw-r--r--bin/config-include/GridCommon.ini.example4
-rw-r--r--bin/config-include/Standalone.ini15
-rw-r--r--bin/config-include/StandaloneCommon.ini.example12
-rwxr-xr-xbin/lib32/BulletSim.dllbin533504 -> 538112 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2333901 -> 2334329 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin686080 -> 690688 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin2528521 -> 2529000 bytes
-rw-r--r--bin/pCampBot.exe.config2
-rw-r--r--bin/startuplogo.txt1
23 files changed, 289 insertions, 220 deletions
diff --git a/bin/Ionic.Zip.dll b/bin/Ionic.Zip.dll
new file mode 100644
index 0000000..95fa928
--- /dev/null
+++ b/bin/Ionic.Zip.dll
Binary files differ
diff --git a/bin/OpenSim.Framework.Serialization.Tests.dll.config b/bin/OpenSim.Framework.Serialization.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Framework.Serialization.Tests.dll.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 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config b/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.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 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config b/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll.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 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Region.OptionalModules.Tests.dll.config b/bin/OpenSim.Region.OptionalModules.Tests.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Region.OptionalModules.Tests.dll.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 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.Tests.Torture.dll.config b/bin/OpenSim.Tests.Torture.dll.config
deleted file mode 100644
index a3f681d..0000000
--- a/bin/OpenSim.Tests.Torture.dll.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 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 4a49fc5..e3107ab 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -31,5 +31,10 @@
31 <appender-ref ref="Console" /> 31 <appender-ref ref="Console" />
32 <appender-ref ref="LogFileAppender" /> 32 <appender-ref ref="LogFileAppender" />
33 </root> 33 </root>
34
35 <logger name="OpenSim.Region.ScriptEngine.XEngine">
36 <level value="INFO"/>
37 </logger>
38
34 </log4net> 39 </log4net>
35</configuration> 40</configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 50366a6..9c68b65 100755..100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -61,17 +61,20 @@
61 ;; Place to create a PID file 61 ;; Place to create a PID file
62 ; PIDFile = "/tmp/my.pid" 62 ; PIDFile = "/tmp/my.pid"
63 63
64 ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
64 ;; Determine where OpenSimulator looks for the files which tell it 65 ;; Determine where OpenSimulator looks for the files which tell it
65 ;; which regions to server 66 ;; which regions to server
66 ;; Default is "filesystem" 67 ;; Default is "filesystem"
67 ; region_info_source = "filesystem" 68 ; region_info_source = "filesystem"
68 ; region_info_source = "web" 69 ; region_info_source = "web"
69 70
71 ;# {regionload_regionsdir} {region_info_source} {Location of file?} {} Regions
70 ;; Determines where the region XML files are stored if you are loading 72 ;; Determines where the region XML files are stored if you are loading
71 ;; these from the filesystem. 73 ;; these from the filesystem.
72 ;; Defaults to bin/Regions in your OpenSimulator installation directory 74 ;; Defaults to bin/Regions in your OpenSimulator installation directory
73 ; regionload_regionsdir="C:\somewhere\xmlfiles\" 75 ; regionload_regionsdir="C:\somewhere\xmlfiles\"
74 76
77 ;# {regionload_webserver_url} {region_info_source} {URL to load region from?} {}
75 ;; Determines the page from which regions xml is retrieved if you are 78 ;; Determines the page from which regions xml is retrieved if you are
76 ;; loading these from the web. 79 ;; loading these from the web.
77 ;; The XML here has the same format as it does on the filesystem 80 ;; The XML here has the same format as it does on the filesystem
@@ -92,6 +95,7 @@
92 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file. 95 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file.
93 ; PhysicalPrimMax = 10 96 ; PhysicalPrimMax = 10
94 97
98 ;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false
95 ;; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum 99 ;; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
96 ;; This can be overriden in the region config file. 100 ;; This can be overriden in the region config file.
97 ; ClampPrimSize = false 101 ; ClampPrimSize = false
@@ -117,6 +121,7 @@
117 ;; This will likely break them 121 ;; This will likely break them
118 ; CombineContiguousRegions = false 122 ; CombineContiguousRegions = false
119 123
124 ;# {InworldRestartShutsDown} {} {Shutdown instance on region restart?} {true false} false
120 ;; If you have only one region in an instance, or to avoid the many bugs 125 ;; If you have only one region in an instance, or to avoid the many bugs
121 ;; that you can trigger in modules by restarting a region, set this to 126 ;; that you can trigger in modules by restarting a region, set this to
122 ;; true to make the entire instance exit instead of restarting the region. 127 ;; true to make the entire instance exit instead of restarting the region.
@@ -131,14 +136,17 @@
131 ;; If both of these values are set to zero then persistence of all changed 136 ;; If both of these values are set to zero then persistence of all changed
132 ;; objects will happen on every sweep. 137 ;; objects will happen on every sweep.
133 138
139 ;# {MinimumTimeBeforePersistenceConsidered} {} {Time before un-changed object may be persisted} {} 60
134 ;; Objects will be considered for persistance in the next sweep when they 140 ;; Objects will be considered for persistance in the next sweep when they
135 ;; have not changed for this number of seconds. 141 ;; have not changed for this number of seconds.
136 ; MinimumTimeBeforePersistenceConsidered = 60 142 ; MinimumTimeBeforePersistenceConsidered = 60
137 143
144 ;# {MaximumTimeBeforePersistenceConsidered} {} {Time before changed objects may be persisted?} {} 600
138 ;; Objects will always be considered for persistance in the next sweep 145 ;; Objects will always be considered for persistance in the next sweep
139 ;; if the first change occurred this number of seconds ago. 146 ;; if the first change occurred this number of seconds ago.
140 ; MaximumTimeBeforePersistenceConsidered = 600 147 ; MaximumTimeBeforePersistenceConsidered = 600
141 148
149 ;# {see_into_this_sim_from_neighbor} {} {Should avatars in neighbor sims see objects in this sim?} {true false} true
142 ;; Should avatars in neighbor sims see objects in this sim? 150 ;; Should avatars in neighbor sims see objects in this sim?
143 ; see_into_this_sim_from_neighbor = true 151 ; see_into_this_sim_from_neighbor = true
144 152
@@ -153,6 +161,7 @@
153 ;; Note that only the ODE physics engine currently deals with meshed 161 ;; Note that only the ODE physics engine currently deals with meshed
154 ;; prims in a satisfactory way. 162 ;; prims in a satisfactory way.
155 163
164 ;# {meshing} {} {Select mesher} {Meshmerizer ZeroMesher} Meshmerizer
156 ;; ZeroMesher is faster but leaves the physics engine to model the mesh 165 ;; ZeroMesher is faster but leaves the physics engine to model the mesh
157 ;; using the basic shapes that it supports. 166 ;; using the basic shapes that it supports.
158 ;; Usually this is only a box. 167 ;; Usually this is only a box.
@@ -161,6 +170,7 @@
161 ; meshing = ZeroMesher 170 ; meshing = ZeroMesher
162 171
163 ;; Choose one of the physics engines below 172 ;; Choose one of the physics engines below
173 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine
164 ;; OpenDynamicsEngine is by some distance the most developed physics engine 174 ;; OpenDynamicsEngine is by some distance the most developed physics engine
165 ;; BulletSim is incomplete and experimental but in active development 175 ;; BulletSim is incomplete and experimental but in active development
166 ;; basicphysics effectively does not model physics at all, making all objects phantom 176 ;; basicphysics effectively does not model physics at all, making all objects phantom
@@ -184,38 +194,52 @@
184 ;; If set to true, then all permissions checks are carried out 194 ;; If set to true, then all permissions checks are carried out
185 ; serverside_object_permissions = true 195 ; serverside_object_permissions = true
186 196
197 ;# {allow_grid_gods} {} {Allow grid gods?} {true false} false
187 ;; This allows users with a UserLevel of 200 or more to assume god 198 ;; This allows users with a UserLevel of 200 or more to assume god
188 ;; powers in the regions in this simulator. 199 ;; powers in the regions in this simulator.
189 ; allow_grid_gods = false 200 ; allow_grid_gods = false
190 201
191 ;; This allows some control over permissions 202 ;; This allows some control over permissions
192 ;; please note that this still doesn't duplicate SL, and is not intended to 203 ;; please note that this still doesn't duplicate SL, and is not intended to
204 ;# {region_owner_is_god} {} {Allow region owner gods} {true false} true
205 ;; Allow region owners to assume god powers in their regions
193 ; region_owner_is_god = true 206 ; region_owner_is_god = true
207
208 ;# {region_manager_is_god} {} {Allow region manager gods} {true false} false
209 ;; Allow region managers to assume god powers in regions they manage
194 ; region_manager_is_god = false 210 ; region_manager_is_god = false
211
212 ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} true
213 ;; Allow parcel owners to assume god powers in their parcels
195 ; parcel_owner_is_god = true 214 ; parcel_owner_is_god = true
196 215
216 ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false
197 ;; More control over permissions 217 ;; More control over permissions
198 ;; This is definitely not SL! 218 ;; This is definitely not SL!
199 ; Provides a simple control for land owners to give build rights to specific avatars 219 ;; Provides a simple control for land owners to give build rights to specific avatars
200 ; in publicly accessible parcels that disallow object creation in general. 220 ;; in publicly accessible parcels that disallow object creation in general.
201 ; Owners specific avatars by adding them to the Access List of the parcel 221 ;; Owners specific avatars by adding them to the Access List of the parcel
202 ; without having to use the Groups feature 222 ;; without having to use the Groups feature
203 ; simple_build_permissions = false 223 ; simple_build_permissions = false
204 224
205 225
226 ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
206 ;; Default script engine to use. Currently, we only have XEngine 227 ;; Default script engine to use. Currently, we only have XEngine
207 ; DefaultScriptEngine = "XEngine" 228 ; DefaultScriptEngine = "XEngine"
208 229
230 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
209 ;; Map tile options. You can choose to generate no map tiles at all, 231 ;; Map tile options. You can choose to generate no map tiles at all,
210 ;; generate normal maptiles, or nominate an uploaded texture to 232 ;; generate normal maptiles, or nominate an uploaded texture to
211 ;; be the map tile 233 ;; be the map tile
212 ; GenerateMaptiles = true 234 ; GenerateMaptiles = true
213 235
236 ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0
214 ;; If desired, a running region can update the map tiles periodically 237 ;; If desired, a running region can update the map tiles periodically
215 ;; to reflect building activity. This names no sense of you don't have 238 ;; to reflect building activity. This names no sense of you don't have
216 ;; prims on maptiles. Value is in seconds. 239 ;; prims on maptiles. Value is in seconds.
217 ; MaptileRefresh = 0 240 ; MaptileRefresh = 0
218 241
242 ;# {MaptileStaticUUID} {} {Asset ID for static map texture} {} 00000000-0000-0000-0000-000000000000
219 ;; If not generating maptiles, use this static texture asset ID 243 ;; If not generating maptiles, use this static texture asset ID
220 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" 244 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
221 245
@@ -228,9 +252,11 @@
228 ;; got a large number of objects, so you can turn it off here if you'd like. 252 ;; got a large number of objects, so you can turn it off here if you'd like.
229 ; DrawPrimOnMapTile = true 253 ; DrawPrimOnMapTile = true
230 254
255 ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080
231 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required 256 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required
232 ; HttpProxy = "http://proxy.com:8080" 257 ; HttpProxy = "http://proxy.com:8080"
233 258
259 ;# {HttpProxyExceptions} {HttpProxy} {Set of regular expressions defining URL that should not be proxied} {}
234 ;; If you're using HttpProxy, then you can set HttpProxyExceptions to a list of regular expressions for URLs that you don't want to go through the proxy 260 ;; If you're using HttpProxy, then you can set HttpProxyExceptions to a list of regular expressions for URLs that you don't want to go through the proxy
235 ;; For example, servers inside your firewall. 261 ;; For example, servers inside your firewall.
236 ;; Separate patterns with a ';' 262 ;; Separate patterns with a ';'
@@ -241,21 +267,67 @@
241 ;; server to send mail through. 267 ;; server to send mail through.
242 ; emailmodule = DefaultEmailModule 268 ; emailmodule = DefaultEmailModule
243 269
270 ;# {SpawnPointRouting} {} {Set routing method for Telehub Spawnpoints} {closest random sequence} closest
271 ;; SpawnPointRouting adjusts the landing for incoming avatars.
272 ;; "closest" will place the avatar at the SpawnPoint located in the closest
273 ;; available spot to the destination (typically map click/landmark).
274 ;; "random" will place the avatar on a randomly selected spawnpoint;
275 ;; "sequence" will place the avatar on the next sequential SpawnPoint
276 ; SpawnPointRouting = closest
277
278 ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false
279 ;; TelehubAllowLandmark allows users with landmarks to override telehub routing and land at the landmark coordinates when set to true
280 ;; default is false
281 ; TelehubAllowLandmark = false
282
283 ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
284 ;; Bar (|) separated list of viewers which may gain access to the regions.
285 ;; One can use a substring of the viewer name to enable only certain versions
286 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
287 ;; - "Imprudence" has access
288 ;; - "Imprudence 1.3" has access
289 ;; - "Imprudence 1.3.1" has no access
290 ; AllowedViewerList =
291
292 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
293 ;# Bar (|) separated list of viewers which may not gain access to the regions.
294 ;; One can use a Substring of the viewer name to disable only certain versions
295 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
296 ;; - "Imprudence" has no access
297 ;; - "Imprudence 1.3" has no access
298 ;; - "Imprudence 1.3.1" has access
299 ; BannedViewerList =
300
301
244[Estates] 302[Estates]
245 ; If these values are commented out then the user will be asked for estate details when required (this is the normal case). 303 ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
246 ; If these values are uncommented then they will be used to create a default estate as necessary. 304 ; If these values are uncommented then they will be used to create a default estate as necessary.
247 ; New regions will be automatically assigned to that default estate. 305 ; New regions will be automatically assigned to that default estate.
248 306
307 ;# {DefaultEstateName} {} {Default name for estate?} {} My Estate
308 ;; Name for the default estate
249 ; DefaultEstateName = My Estate 309 ; DefaultEstateName = My Estate
310
311 ;# {DefaultEstateOwnerName} {} {Default estate owner name?} {} FirstName LastName
312 ;; Name for default estate owner
250 ; DefaultEstateOwnerName = FirstName LastName 313 ; DefaultEstateOwnerName = FirstName LastName
251
252 ; The following parameters will only be used on a standalone system to create an estate owner that does not already exist
253 314
254 ; If DefaultEstateOwnerUUID is left at UUID.Zero (as below) then a random UUID will be assigned. 315
255 ; This is normally what you want 316 ; ** Standalone Estate Settings **
317 ; The following parameters will only be used on a standalone system to
318 ; create an estate owner that does not already exist
319
320 ;# {DefaultEstateOwnerUUID} {} {Default estate owner UUID?} {} 00000000-0000-0000-0000-000000000000
321 ;; If DefaultEstateOwnerUUID is left at UUID.Zero (as below) then a random
322 ;; UUID will be assigned. This is normally what you want
256 ; DefaultEstateOwnerUUID = 00000000-0000-0000-0000-000000000000 323 ; DefaultEstateOwnerUUID = 00000000-0000-0000-0000-000000000000
257 324
325 ;# {DefaultEstateOwnerEMail} {} {Default estate owner email?} {}
326 ;; Email address for the default estate owner
258 ; DefaultEstateOwnerEMail = owner@domain.com 327 ; DefaultEstateOwnerEMail = owner@domain.com
328
329 ;# {DefaultEstateOwnerPassword} {} {Default estate owner password} {}
330 ;; Password for the default estate owner
259 ; DefaultEstateOwnerPassword = password 331 ; DefaultEstateOwnerPassword = password
260 332
261 333
@@ -273,6 +345,12 @@
273 ;# {host_domain_header_from} {[Startup]emailmodule:DefaultEmailModule enabled:true} {From address to use in the sent email header?} {} 127.0.0.1 345 ;# {host_domain_header_from} {[Startup]emailmodule:DefaultEmailModule enabled:true} {From address to use in the sent email header?} {} 127.0.0.1
274 ; host_domain_header_from = "127.0.0.1" 346 ; host_domain_header_from = "127.0.0.1"
275 347
348 ;# {email_pause_time} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Period in seconds to delay after an email is sent.} {} 20
349 ; email_pause_time = 20
350
351 ;# {email_max_size} {[Startup]emailmodule:DefaultEmailModule enabled:true} {Maximum total size of email in bytes.} {} 4096
352 ; email_max_size = 4096
353
276 ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1 354 ;# {SMTP_SERVER_HOSTNAME} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server name?} {} 127.0.0.1
277 ; SMTP_SERVER_HOSTNAME = "127.0.0.1" 355 ; SMTP_SERVER_HOSTNAME = "127.0.0.1"
278 356
@@ -285,12 +363,15 @@
285 ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {} 363 ;# {SMTP_SERVER_PASSWORD} {[Startup]emailmodule:DefaultEmailModule enabled:true} {SMTP server password} {}
286 ; SMTP_SERVER_PASSWORD = "" 364 ; SMTP_SERVER_PASSWORD = ""
287 365
288
289[Network] 366[Network]
367
368 ;# {ConsoleUser} {} {User name for console account} {}
290 ;; Configure the remote console user here. This will not actually be used 369 ;; Configure the remote console user here. This will not actually be used
291 ;; unless you use -console=rest at startup. 370 ;; unless you use -console=rest at startup.
292 ; ConsoleUser = "Test" 371 ; ConsoleUser = "Test"
372 ;# {ConsolePass} {} {Password for console account} {}
293 ; ConsolePass = "secret" 373 ; ConsolePass = "secret"
374 ;# {console_port} {} {Port for console connections} {} 0
294 ; console_port = 0 375 ; console_port = 0
295 376
296 ;# {http_listener_port} {} {TCP Port for this simulator to listen on? (This must be unique to the simulator!)} {} 9000 377 ;# {http_listener_port} {} {TCP Port for this simulator to listen on? (This must be unique to the simulator!)} {} 9000
@@ -354,11 +435,14 @@
354 435
355 436
356[SimulatorFeatures] 437[SimulatorFeatures]
438
439 ;# {MapImageServerURI} {} {URL for the map server} {}
357 ; Experimental new information sent in SimulatorFeatures cap for Kokua viewers 440 ; Experimental new information sent in SimulatorFeatures cap for Kokua viewers
358 ; meant to override the MapImage and search server url given at login, and varying 441 ; meant to override the MapImage and search server url given at login, and varying
359 ; on a sim-basis. 442 ; on a sim-basis.
360 ; Viewers that don't understand it, will ignore it 443 ; Viewers that don't understand it, will ignore it
361 ;MapImageServerURI = "http://127.0.0.1:9000/" 444 ;MapImageServerURI = "http://127.0.0.1:9000/"
445 ;# {SearchServerURI} {} {URL of the search server} {}
362 ;SearchServerURI = "http://127.0.0.1:9000/" 446 ;SearchServerURI = "http://127.0.0.1:9000/"
363 447
364 448
@@ -552,6 +636,7 @@
552 636
553 637
554[Economy] 638[Economy]
639 ;# {SellEnabled} {} {Enable selling for 0?} {true false} true
555 ; The default economy module only implements just enough to allow free actions (transfer of objects, etc). 640 ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
556 ; There is no intention to implement anything further in core OpenSimulator. 641 ; There is no intention to implement anything further in core OpenSimulator.
557 ; This functionality has to be provided by third party modules. 642 ; This functionality has to be provided by third party modules.
@@ -559,9 +644,11 @@
559 ;; Enables selling things for $0. Default is true. 644 ;; Enables selling things for $0. Default is true.
560 ; SellEnabled = true 645 ; SellEnabled = true
561 646
647 ;# {PriceUpload} {} {Price for uploading?} {} 0
562 ;; Money Unit fee to upload textures, animations etc. Default is 0. 648 ;; Money Unit fee to upload textures, animations etc. Default is 0.
563 ; PriceUpload = 0 649 ; PriceUpload = 0
564 650
651 ;# {PriceGroupCreate} {} {Fee for group creation} {} 0
565 ;; Money Unit fee to create groups. Default is 0. 652 ;; Money Unit fee to create groups. Default is 0.
566 ; PriceGroupCreate = 0 653 ; PriceGroupCreate = 0
567 654
@@ -638,8 +725,11 @@
638 ; AllowLightShareFunctions = false 725 ; AllowLightShareFunctions = false
639 726
640 ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow 727 ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow
641 ;; Threat level to allow, one of None, VeryLow, Low, Moderate, High, 728 ;; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
642 ;; VeryHigh, Severe 729 ;; See http://opensimulator.org/wiki/Threat_level for more information on these levels.
730 ;; We do not recommend that use set a general level above Low unless you have a high level of trust
731 ;; in all the users that can run scripts in your simulator. It is safer to explicitly
732 ;; allow certain types of user to run higher threat level OSSL functions, as detailed later on.
643 OSFunctionThreatLevel = VeryLow 733 OSFunctionThreatLevel = VeryLow
644 734
645 ; OS Functions enable/disable 735 ; OS Functions enable/disable
@@ -656,10 +746,10 @@
656 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb 746 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
657 747
658 ; Comma separated list of owner classes that allow the function for a particular class of owners. Choices are 748 ; Comma separated list of owner classes that allow the function for a particular class of owners. Choices are
659 ; - PARCEL_GROUP_MEMBER: allow if objectgroup is the same group as the parcel 749 ; - PARCEL_GROUP_MEMBER: allow if the object group is the same group as the parcel
660 ; - PARCEL_OWNER: allow if the objectowner is parcelowner 750 ; - PARCEL_OWNER: allow if the object owner is the parcel owner
661 ; - ESTATE_MANAGER: allow if the object owner is a estate manager 751 ; - ESTATE_MANAGER: allow if the object owner is an estate manager
662 ; - ESTATE_OWNER: allow if objectowner is estateowner 752 ; - ESTATE_OWNER: allow if the object owner is the estate owner
663 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb, PARCEL_OWNER, ESTATE_OWNER>, ... 753 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb, PARCEL_OWNER, ESTATE_OWNER>, ...
664 754
665 ; You can also use script creators as the uuid 755 ; You can also use script creators as the uuid
@@ -668,32 +758,41 @@
668 ; If both Allow_ and Creators_ are given, effective permissions 758 ; If both Allow_ and Creators_ are given, effective permissions
669 ; are the union of the two. 759 ; are the union of the two.
670 760
761 ;# {EventLimit} {} {Amount of time a script can spend in an event handler} {} 30
671 ;; Time a script can spend in an event handler before it is interrupted 762 ;; Time a script can spend in an event handler before it is interrupted
672 ; EventLimit = 30 763 ; EventLimit = 30
673 764
765 ;# {KillTimedOutScripts} {} {Kill script in case of event time overruns?} {true false} false
674 ;; If a script overruns it's event limit, kill the script? 766 ;; If a script overruns it's event limit, kill the script?
675 ; KillTimedOutScripts = false 767 ; KillTimedOutScripts = false
676 768
769 ;# {ScriptDelayFactor} {} {Multiplier for scripting delays} {} 1.0
677 ;; Sets the multiplier for the scripting delays 770 ;; Sets the multiplier for the scripting delays
678 ; ScriptDelayFactor = 1.0 771 ; ScriptDelayFactor = 1.0
679 772
680 ;; The factor the 10 m distances llimits are multiplied by 773 ;# {ScriptDistanceLimitFactor} {} {Multiplier for 10.0m distance limits?} {}
774 ;; The factor the 10 m distances limits are multiplied by
681 ; ScriptDistanceLimitFactor = 1.0 775 ; ScriptDistanceLimitFactor = 1.0
682 776
777 ;# {NotecardLineReadCharsMax} {} {Maximum length of notecard line?} {} 255
683 ;; Maximum length of notecard line read 778 ;; Maximum length of notecard line read
684 ;; Increasing this to large values potentially opens 779 ;; Increasing this to large values potentially opens
685 ;; up the system to malicious scripters 780 ;; up the system to malicious scripters
686 ; NotecardLineReadCharsMax = 255 781 ; NotecardLineReadCharsMax = 255
687 782
783 ;# {SensorMaxRange} {} {Sensor range} {} 96.0
688 ;; Sensor settings 784 ;; Sensor settings
689 ; SensorMaxRange = 96.0 785 ; SensorMaxRange = 96.0
786 ;# {SensorMaxResults} {} {Max sensor results returned?} {}
690 ; SensorMaxResults = 16 787 ; SensorMaxResults = 16
691 788
789 ;# {DisableUndergroundMovement} {} {Disable underground movement of prims} {true false} true
692 ;; Disable underground movement of prims (default true); set to 790 ;; Disable underground movement of prims (default true); set to
693 ;; false to allow script controlled underground positioning of 791 ;; false to allow script controlled underground positioning of
694 ;; prims 792 ;; prims
695 ; DisableUndergroundMovement = true 793 ; DisableUndergroundMovement = true
696 794
795 ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines
697 ;; Path to script engine assemblies 796 ;; Path to script engine assemblies
698 ;; Default is ./bin/ScriptEngines 797 ;; Default is ./bin/ScriptEngines
699 ; ScriptEnginesPath = "ScriptEngines" 798 ; ScriptEnginesPath = "ScriptEngines"
@@ -780,7 +879,7 @@
780 ;; groups service if the service is using these keys 879 ;; groups service if the service is using these keys
781 ; XmlRpcServiceReadKey = 1234 880 ; XmlRpcServiceReadKey = 1234
782 ; XmlRpcServiceWriteKey = 1234 881 ; XmlRpcServiceWriteKey = 1234
783 882
784[InterestManagement] 883[InterestManagement]
785 ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness 884 ;# {UpdatePrioritizationScheme} {} {Update prioritization scheme?} {BestAvatarResponsiveness Time Distance SimpleAngularDistance FrontBack} BestAvatarResponsiveness
786 ;; This section controls how state updates are prioritized for each client 885 ;; This section controls how state updates are prioritized for each client
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6fb9787..6d699fd 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -33,6 +33,10 @@
33 ; Console commands run every 20 minutes 33 ; Console commands run every 20 minutes
34 ; timer_Script = "filename" 34 ; timer_Script = "filename"
35 35
36 ; timer_Script time interval (default 20 min)
37 ; The time is 60 per minute
38 ; timer_Interval = 1200
39
36 ; ## 40 ; ##
37 ; ## SYSTEM 41 ; ## SYSTEM
38 ; ## 42 ; ##
@@ -337,6 +341,13 @@
337 ; OpenJPEG if false 341 ; OpenJPEG if false
338 ; UseCSJ2K = true 342 ; UseCSJ2K = true
339 343
344
345 ; Use "Trash" folder for items deleted from the scene
346 ; When set to True (the default) items deleted from the scene will be
347 ; stored in the user's trash or lost and found folder. When set to
348 ; False items will be removed from the scene permanently
349 UseTrashOnDelete = True
350
340 ; Persist avatar baked textures 351 ; Persist avatar baked textures
341 ; Persisting baked textures can speed up login and region border 352 ; Persisting baked textures can speed up login and region border
342 ; crossings especially with large numbers of users, though it 353 ; crossings especially with large numbers of users, though it
@@ -527,7 +538,20 @@
527 ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps 538 ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
528 ; will also be affected. 539 ; will also be affected.
529 ; 540 ;
530 ;DisableFacelights = "false(1815) 541 ;DisableFacelights = false
542
543 ; The time to wait before disconecting an unresponsive client.
544 ; The time is in seconds. The default is one minute
545 ;
546 ;AckTimeout = 60
547
548 ; The time to wait before disconecting an unresponsive paused client.
549 ; A client can be paused when the file selection dialog is open during file upload.
550 ; This gives extra time to find files via the dialog but will still disconnect if
551 ; the client crashes or loses its network connection
552 ; The time is in seconds. The default is five minutes.
553 ;
554 ;PausedAckTimeout = 300
531 555
532[ClientStack.LindenCaps] 556[ClientStack.LindenCaps]
533 ;; Long list of capabilities taken from 557 ;; Long list of capabilities taken from
@@ -542,6 +566,7 @@
542 Cap_CopyInventoryFromNotecard = "localhost" 566 Cap_CopyInventoryFromNotecard = "localhost"
543 Cap_DispatchRegionInfo = "" 567 Cap_DispatchRegionInfo = ""
544 Cap_EstateChangeInfo = "" 568 Cap_EstateChangeInfo = ""
569 Cap_EnvironmentSettings = "localhost"
545 Cap_EventQueueGet = "localhost" 570 Cap_EventQueueGet = "localhost"
546 Cap_FetchInventory = "" 571 Cap_FetchInventory = ""
547 Cap_ObjectMedia = "localhost" 572 Cap_ObjectMedia = "localhost"
@@ -594,13 +619,12 @@
594 Cap_ViewerStartAuction = "" 619 Cap_ViewerStartAuction = ""
595 Cap_ViewerStats = "" 620 Cap_ViewerStats = ""
596 621
597 ; The various fetch inventory caps are supported by OpenSim, but may 622 ; Capabilities for fetching inventory over HTTP rather than UDP
598 ; lead to poor sim performance if served by the simulators,
599 ; so they are currently disabled by default.
600 ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above) 623 ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above)
624 ; It appears that Linden Lab viewer 3.3.1 onwards will not work properly if FetchInventoryDescendents2 and FetchInventory2 are not enabled
601 Cap_WebFetchInventoryDescendents = "" 625 Cap_WebFetchInventoryDescendents = ""
602 Cap_FetchInventoryDescendents2 = "" 626 Cap_FetchInventoryDescendents2 = "localhost"
603 Cap_FetchInventory2 = "" 627 Cap_FetchInventory2 = "localhost"
604 628
605 629
606[Chat] 630[Chat]
@@ -668,6 +692,25 @@
668 692
669 693
670[ODEPhysicsSettings] 694[ODEPhysicsSettings]
695 ; ##
696 ; ## Physics stats settings
697 ;
698
699 ; If collect_stats is enabled, then extra stat information is collected which is accessible via the MonitorModule
700 ; (see http://opensimulator.org/wiki/Monitoring_Module for more details).
701 collect_stats = false
702
703 ; ##
704 ; ## Physics logging settings - logfiles are saved to *.DIF files
705 ; ##
706
707 ; default is false
708 ;physics_logging = true
709 ;; every n simulation iterations, the physics snapshot file is updated
710 ;physics_logging_interval = 50
711 ;; append to existing physics logfile, or overwrite existing logfiles?
712 ;physics_logging_append_existing_logfile = true
713
671 ;## 714 ;##
672 ;## World Settings 715 ;## World Settings
673 ;## 716 ;##
@@ -817,17 +860,6 @@
817 mesh_physical_lod = 16 860 mesh_physical_lod = 16
818 861
819 ; ## 862 ; ##
820 ; ## Physics logging settings - logfiles are saved to *.DIF files
821 ; ##
822
823 ; default is false
824 ;physics_logging = true
825 ;; every n simulation iterations, the physics snapshot file is updated
826 ;physics_logging_interval = 50
827 ;; append to existing physics logfile, or overwrite existing logfiles?
828 ;physics_logging_append_existing_logfile = true
829
830 ; ##
831 ; ## Joint support 863 ; ## Joint support
832 ; ## 864 ; ##
833 865
@@ -1125,16 +1157,20 @@
1125 ; currently unused 1157 ; currently unused
1126 ; AllowosConsoleCommand=false 1158 ; AllowosConsoleCommand=false
1127 1159
1160 ; Are god functions such as llSetObjectPermMask() allowed? If true then gods and only gods have access to these functions.
1161 ; If false then gods cannot execute these functions either.
1128 AllowGodFunctions = false 1162 AllowGodFunctions = false
1129 1163
1130 ; Maximum number of llListen events we allow over the entire region. 1164 ; Maximum number of llListen events we allow over the entire region.
1131 ; Set this to 0 to have no limit imposed 1165 ; Set this to 0 to have no limit imposed
1132 max_listeners_per_region = 1000 1166 max_listens_per_region = 1000
1133 1167
1134 ; Maximum number of llListen events we allow per script 1168 ; Maximum number of llListen events we allow per script
1135 ; Set this to 0 to have no limit imposed. 1169 ; Set this to 0 to have no limit imposed.
1136 max_listens_per_script = 64 1170 max_listens_per_script = 64
1137 1171
1172 ; Maximum number of external urls that scripts can set up in this simulator (e.g. via llRequestURL())
1173 max_external_urls_per_simulator = 100
1138 1174
1139[DataSnapshot] 1175[DataSnapshot]
1140 ; The following set of configs pertains to search. 1176 ; The following set of configs pertains to search.
@@ -1561,6 +1597,12 @@
1561 RefreshTime = 3600 1597 RefreshTime = 3600
1562 1598
1563;; 1599;;
1600;; JsonStore module provides structured store for scripts
1601;;
1602[JsonStore]
1603Enabled = False
1604
1605;;
1564;; These are defaults that are overwritten below in [Architecture]. 1606;; These are defaults that are overwritten below in [Architecture].
1565;; These defaults allow OpenSim to work out of the box with 1607;; These defaults allow OpenSim to work out of the box with
1566;; zero configuration 1608;; zero configuration
diff --git a/bin/PrimMesher.dll b/bin/PrimMesher.dll
index 249e91c..87022b7 100755
--- a/bin/PrimMesher.dll
+++ b/bin/PrimMesher.dll
Binary files differ
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 2fd9f11..3eecdd9 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -185,7 +185,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
185 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 185 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
186 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user. 186 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
187 ;; Default is false 187 ;; Default is false
188 ; CreateDefaultAvatarEntries = false 188 CreateDefaultAvatarEntries = true
189 189
190 ;; Allow the service to process HTTP createuser calls. 190 ;; Allow the service to process HTTP createuser calls.
191 ;; Default is false. 191 ;; Default is false.
@@ -237,12 +237,19 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
237 237
238 WelcomeMessage = "Welcome, Avatar!" 238 WelcomeMessage = "Welcome, Avatar!"
239 AllowRemoteSetLoginLevel = "false" 239 AllowRemoteSetLoginLevel = "false"
240 240
241 ; For V2 map 241 ; For V2 map
242 MapTileURL = "http://127.0.0.1:8002"; 242 MapTileURL = "http://127.0.0.1:8002";
243 243
244 ; For WebProfiles (V3) 244 ; For V2/3 Web Profiles
245 ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" 245 ; Work in progress: The ProfileServerURL/OpenIDServerURL are
246 ; being used in a development viewer as support for webprofiles
247 ; is being developed across the componets
248 ;
249 ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
250 ;
251 ; For V2/V3 webapp authentication SSO
252 ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
246 253
247 ; If you run this login server behind a proxy, set this to true 254 ; If you run this login server behind a proxy, set this to true
248 ; HasProxy = false 255 ; HasProxy = false
@@ -275,10 +282,29 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
275 ;AllowedClients = "" 282 ;AllowedClients = ""
276 ;DeniedClients = "" 283 ;DeniedClients = ""
277 284
285 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
286 ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
287 ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
288 ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
289 ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
290 ;; Options are
291 ;; "none" no DST
292 ;; "local" use the server's only timezone to calculate DST. This is previous OpenSimulator behaviour.
293 ;; "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
294 ;; 'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
295 DSTZone = "America/Los_Angeles;Pacific Standard Time"
296
278[MapImageService] 297[MapImageService]
279 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 298 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
280 ; Set this if you want to change the default 299 ; Set this if you want to change the default
281 ; TilesStoragePath = "maptiles" 300 ; TilesStoragePath = "maptiles"
301 ;
302 ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002),
303 ; you may want to set this. Otherwise, don't set it, because it's already protected.
304 ; GridService = "OpenSim.Services.GridService.dll:GridService"
305 ;
306 ; Additionally, if you run this server behind a proxy, set this to true
307 ; HasProxy = false
282 308
283[GridInfoService] 309[GridInfoService]
284 ; These settings are used to return information on a get_grid_info call. 310 ; These settings are used to return information on a get_grid_info call.
@@ -318,6 +344,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
318 344
319 ; password help: optional: page providing password assistance for users of your grid 345 ; password help: optional: page providing password assistance for users of your grid
320 ;password = http://127.0.0.1/password 346 ;password = http://127.0.0.1/password
347
348 ; HG address of the gatekeeper, if you have one
349 ; this is the entry point for all the regions of the world
350 ; gatekeeper = http://127.0.0.1:8002/
351
352 ; HG user domain, if you have one
353 ; this is the entry point for all user-related HG services
354 ; uas = http://127.0.0.1:8002/
321 355
322[GatekeeperService] 356[GatekeeperService]
323 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" 357 LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 69e94a5..5a9d613 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -166,7 +166,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
166 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 166 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
167 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user. 167 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
168 ;; Default is false 168 ;; Default is false
169 ; CreateDefaultAvatarEntries = false 169 CreateDefaultAvatarEntries = true
170 170
171 ;; Allow the service to process HTTP createuser calls. 171 ;; Allow the service to process HTTP createuser calls.
172 ;; Default is false. 172 ;; Default is false.
@@ -225,10 +225,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
225 MapTileURL = "http://127.0.0.1:8002"; 225 MapTileURL = "http://127.0.0.1:8002";
226 226
227 ; For V2/3 Web Profiles 227 ; For V2/3 Web Profiles
228 ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" 228 ; Work in progress: The ProfileServerURL/OpenIDServerURL are
229 229 ; being used in a development viewer as support for webprofiles
230 ; is being developed across the componets
231 ;
232 ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
233 ;
230 ; For V2/V3 webapp authentication SSO 234 ; For V2/V3 webapp authentication SSO
231 OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" 235 ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
232 236
233 ; If you run this login server behind a proxy, set this to true 237 ; If you run this login server behind a proxy, set this to true
234 ; HasProxy = false 238 ; HasProxy = false
@@ -250,10 +254,39 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
250 ;AllowedClients = "" 254 ;AllowedClients = ""
251 ;DeniedClients = "" 255 ;DeniedClients = ""
252 256
257 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
258 ;; Viewers do not listen to timezone sent by the server. They use Pacific Standard Time instead,
259 ;; but rely on the server to calculate Daylight Saving Time. Sending another DST than US Pacific
260 ;; would result in time inconsistencies between grids (during summer and around DST transition period)
261 ;; default let OpenSim calculate US Pacific DST
262 ;; "none" disable DST (equivallent to "local" with system set to GMT)
263 ;; "local" force legacy behaviour (using local system time to calculate DST)
264 ; DSTZone = "America/Los_Angeles;Pacific Standard Time"
265
266 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
267 ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
268 ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
269 ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
270 ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
271 ;; Options are
272 ;; "none" no DST
273 ;; "local" use the server's only timezone to calculate DST. This is previous OpenSimulator behaviour.
274 ;; "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
275 ;; 'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
276 DSTZone = "America/Los_Angeles;Pacific Standard Time"
277
253[MapImageService] 278[MapImageService]
254 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 279 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
255 ; Set this if you want to change the default 280 ; Set this if you want to change the default
256 ; TilesStoragePath = "maptiles" 281 ; TilesStoragePath = "maptiles"
282 ;
283 ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002),
284 ; you may want to set this. Otherwise, don't set it, because it's already protected.
285 ; GridService = "OpenSim.Services.GridService.dll:GridService"
286 ;
287 ; Additionally, if you run this server behind a proxy, set this to true
288 ; HasProxy = false
289
257 290
258 291
259[GridInfoService] 292[GridInfoService]
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index cd39f8c..b9c6d84 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -36,7 +36,7 @@
36 36
37 ; How often {in hours} should the disk be checked for expired filed 37 ; How often {in hours} should the disk be checked for expired filed
38 ; Specify 0 to disable expiration checking 38 ; Specify 0 to disable expiration checking
39 FileCleanupTimer = .166 ;roughly every 10 minutes 39 FileCleanupTimer = 1.0 ;every hour
40 40
41 ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how 41 ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
42 ; long (in miliseconds) to block a request thread while trying to complete 42 ; long (in miliseconds) to block a request thread while trying to complete
@@ -60,4 +60,4 @@
60 ; cache, and request all assets that are found that are not already cached (this 60 ; cache, and request all assets that are found that are not already cached (this
61 ; will cause those assets to be cached) 61 ; will cause those assets to be cached)
62 ; 62 ;
63 ; DeepScanBeforePurge = false 63 DeepScanBeforePurge = true
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 95d6264..cb3a5c8 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -29,9 +29,6 @@
29 SimulationServiceInConnector = true 29 SimulationServiceInConnector = true
30 LibraryModule = true 30 LibraryModule = true
31 31
32[Profile]
33 Module = "BasicProfileModule"
34
35[SimulationDataStore] 32[SimulationDataStore]
36 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" 33 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
37 34
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index fa6f525..8d7f6fc 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,10 @@
137 ;; uncomment the next line. You may want to do this on sims that have licensed content. 137 ;; uncomment the next line. You may want to do this on sims that have licensed content.
138 ; OutboundPermission = False 138 ; OutboundPermission = False
139 139
140[HGFriendsModule]
141 ; User level required to be able to send friendship invitations to foreign users
142 ;LevelHGFriends = 0;
143
140[UserAgentService] 144[UserAgentService]
141 ; 145 ;
142 ; === HG ONLY === 146 ; === HG ONLY ===
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d307387..ba72fe7 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -25,9 +25,6 @@
25 GridInfoServiceInConnector = true 25 GridInfoServiceInConnector = true
26 MapImageServiceInConnector = true 26 MapImageServiceInConnector = true
27 27
28[Profile]
29 Module = "BasicProfileModule"
30
31[SimulationDataStore] 28[SimulationDataStore]
32 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" 29 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
33 30
@@ -95,6 +92,18 @@
95 92
96 WelcomeMessage = "Welcome, Avatar!" 93 WelcomeMessage = "Welcome, Avatar!"
97 94
95 ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time"
96 ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time
97 ;; However, they do rely on the server to tell them whether it's Daylight Saving Time or not.
98 ;; Hence, calculating DST based on a different timezone can result in a misleading viewer display and inconsistencies between grids.
99 ;; By default, this setting uses various timezone names to calculate DST with regards to the viewer's standard PST.
100 ;; Options are
101 ;; "none" no DST
102 ;; "local" use the server's only timezone to calculate DST. This is previous OpenSimulator behaviour.
103 ;; "America/Los_Angeles;Pacific Standard Time" use these timezone names to look up Daylight savings.
104 ;; 'America/Los_Angeles' is used on Linux/Mac systems whilst 'Pacific Standard Time' is used on Windows
105 DSTZone = "America/Los_Angeles;Pacific Standard Time"
106
98[MapImageService] 107[MapImageService]
99 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 108 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
100 ; in minutes 109 ; in minutes
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 8d9842c..e4bc548 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -61,6 +61,10 @@
61 ;; uncomment the next line. You may want to do this on sims that have licensed content. 61 ;; uncomment the next line. You may want to do this on sims that have licensed content.
62 ; OutboundPermission = False 62 ; OutboundPermission = False
63 63
64[HGFriendsModule]
65 ; User level required to be able to send friendship invitations to foreign users
66 ;LevelHGFriends = 0;
67
64[GridService] 68[GridService]
65 ;; For in-memory region storage (default) 69 ;; For in-memory region storage (default)
66 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 70 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
@@ -231,6 +235,14 @@
231 ; currently unused 235 ; currently unused
232 ;password = http://127.0.0.1/password 236 ;password = http://127.0.0.1/password
233 237
238 ; HG address of the gatekeeper, if you have one
239 ; this is the entry point for all the regions of the world
240 ; gatekeeper = http://127.0.0.1:9000/
241
242 ; HG user domain, if you have one
243 ; this is the entry point for all user-related HG services
244 ; uas = http://127.0.0.1:9000/
245
234[MapImageService] 246[MapImageService]
235 ; Set this if you want to change the default 247 ; Set this if you want to change the default
236 ; TilesStoragePath = "maptiles" 248 ; TilesStoragePath = "maptiles"
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 2c28063..a3ccb98 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
Binary files differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index f40f446..0b286aa 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
Binary files differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index d9e5e89..d91dac1 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
Binary files differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 06770a4..891c956 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config
index 3f19ee8..9cfb7e9 100644
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config
@@ -8,7 +8,7 @@
8 <log4net> 8 <log4net>
9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 9 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
10 <layout type="log4net.Layout.PatternLayout"> 10 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> 11 <conversionPattern value="%date{HH:mm:ss.fff} - %message%newline" />
12 </layout> 12 </layout>
13 </appender> 13 </appender>
14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> 14 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
diff --git a/bin/startuplogo.txt b/bin/startuplogo.txt
index 0d11e77..e69de29 100644
--- a/bin/startuplogo.txt
+++ b/bin/startuplogo.txt
@@ -1 +0,0 @@
1STARTUP COMPLETE
generated by cgit v1.1 at 2024-10-25 18:26:47 +0000