aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/BulletXNA.dllbin0 -> 610304 bytes
-rw-r--r--bin/BulletXNA.pdbbin0 -> 1963520 bytes
-rwxr-xr-xbin/Mono.Addins.CecilReflector.dllbin364032 -> 290816 bytes
-rwxr-xr-xbin/Mono.Addins.Setup.dllbin103424 -> 135168 bytes
-rwxr-xr-xbin/Mono.Addins.dllbin202752 -> 233472 bytes
-rw-r--r--bin/OpenMetaverse.dll.config2
-rwxr-xr-xbin/OpenSim.exe.config6
-rw-r--r--bin/OpenSim.ini.example34
-rw-r--r--bin/OpenSimDefaults.ini101
-rw-r--r--bin/Regions/Regions.ini.example1
-rw-r--r--bin/Robust.HG.ini.example13
-rw-r--r--bin/Robust.ini.example13
-rw-r--r--bin/config-include/GridCommon.ini.example5
-rw-r--r--bin/data/LICENSE-README-IMPORTANT.txt2
-rw-r--r--bin/data/sim.css85
-rw-r--r--bin/data/sim.html291
-rwxr-xr-xbin/lib32/BulletSim.dllbin551424 -> 545280 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1707321 -> 1690012 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin699904 -> 693248 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1844228 -> 1834927 bytes
20 files changed, 501 insertions, 52 deletions
diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll
new file mode 100644
index 0000000..bfaac4f
--- /dev/null
+++ b/bin/BulletXNA.dll
Binary files differ
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb
new file mode 100644
index 0000000..ecab22f
--- /dev/null
+++ b/bin/BulletXNA.pdb
Binary files differ
diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll
index a1a6382..9ca4631 100755
--- a/bin/Mono.Addins.CecilReflector.dll
+++ b/bin/Mono.Addins.CecilReflector.dll
Binary files differ
diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll
index 8aa6d5f..75773aa 100755
--- a/bin/Mono.Addins.Setup.dll
+++ b/bin/Mono.Addins.Setup.dll
Binary files differ
diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll
index ea330fd..326ed1d 100755
--- a/bin/Mono.Addins.dll
+++ b/bin/Mono.Addins.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index b67da5f..f5423b2 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,5 +1,5 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.5.0-dotnet-1.dylib" /> 2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" />
4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" /> 4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" />
5</configuration> 5</configuration>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index e3107ab..8a891f4 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -32,9 +32,15 @@
32 <appender-ref ref="LogFileAppender" /> 32 <appender-ref ref="LogFileAppender" />
33 </root> 33 </root>
34 34
35 <!-- Independently control logging level for XEngine -->
35 <logger name="OpenSim.Region.ScriptEngine.XEngine"> 36 <logger name="OpenSim.Region.ScriptEngine.XEngine">
36 <level value="INFO"/> 37 <level value="INFO"/>
37 </logger> 38 </logger>
38 39
40 <!-- Independently control logging level for per region module loading -->
41 <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
42 <level value="INFO"/>
43 </logger>
44
39 </log4net> 45 </log4net>
40</configuration> 46</configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6757081..26eb8ed 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -206,12 +206,13 @@
206 ;; Choose one of the physics engines below 206 ;; Choose one of the physics engines below
207 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine 207 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine
208 ;; OpenDynamicsEngine is by some distance the most developed physics engine 208 ;; OpenDynamicsEngine is by some distance the most developed physics engine
209 ;; BulletSim is incomplete and experimental but in active development 209 ;; BulletSim is incomplete and experimental but in active development. BulletSimN is a purely C# version of BulletSim.
210 ;; basicphysics effectively does not model physics at all, making all 210 ;; basicphysics effectively does not model physics at all, making all
211 ;; objects phantom 211 ;; objects phantom.
212 ;; Default is OpenDynamicsEngine 212 ;; Default is OpenDynamicsEngine
213 ; physics = OpenDynamicsEngine 213 ; physics = OpenDynamicsEngine
214 ; physics = BulletSim 214 ; physics = BulletSim
215 ; physics = BulletSimN
215 ; physics = basicphysics 216 ; physics = basicphysics
216 ; physics = POS 217 ; physics = POS
217 218
@@ -744,13 +745,6 @@
744 ;; The trade-off may be increased memory usage by the script engine. 745 ;; The trade-off may be increased memory usage by the script engine.
745 ; ThreadStackSize = 262144 746 ; ThreadStackSize = 262144
746 747
747 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true
748 ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
749 ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
750 ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
751 ;; by scripts have changed.
752 ; DeleteScriptsOnStartup = true
753
754 ;; Set this to true (the default) to load each script into a separate 748 ;; Set this to true (the default) to load each script into a separate
755 ;; AppDomain. 749 ;; AppDomain.
756 ;; 750 ;;
@@ -763,6 +757,23 @@
763 ;; Some Windows users have also reported script loading problems when AppDomainLoading = false 757 ;; Some Windows users have also reported script loading problems when AppDomainLoading = false
764 ; AppDomainLoading = true 758 ; AppDomainLoading = true
765 759
760 ;; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
761 ;; co-op will be more stable but this option is currently experimental.
762 ;; If moving from co-op to abort, existing script DLLs will need to be recompiled.
763 ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
764 ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
765 ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
766 ;; Current valid values are "abort" and "co-op"
767 ; ScriptStopStrategy = abort
768
769
770 ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true
771 ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
772 ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
773 ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
774 ;; by scripts have changed.
775 ; DeleteScriptsOnStartup = true
776
766 ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl 777 ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl
767 ;; Default language for scripts 778 ;; Default language for scripts
768 ; DefaultCompileLanguage = "lsl" 779 ; DefaultCompileLanguage = "lsl"
@@ -786,8 +797,9 @@
786 ;; Allow the use of os* functions (some are dangerous) 797 ;; Allow the use of os* functions (some are dangerous)
787 ; AllowOSFunctions = false 798 ; AllowOSFunctions = false
788 799
789 ;# {AllowLightShareFunctions} {Enabled:true [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} true 800 ;# {AllowLightShareFunctions} {Enabled:false [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} false
790 ; Allow the user of LightShare functions 801 ; Allow the use of LightShare functions.
802 ; The setting enable_windlight = true must also be enabled in the [LightShare] section.
791 ; AllowLightShareFunctions = false 803 ; AllowLightShareFunctions = false
792 804
793 ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow 805 ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 54f252e..fa88146 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -217,10 +217,10 @@
217 ; to false if you have compatibility problems. 217 ; to false if you have compatibility problems.
218 ;CacheSculptMaps = true 218 ;CacheSculptMaps = true
219 219
220 ; Choose one of the physics engines below 220 ; Choose one of the physics engines below.
221 ; OpenDynamicsEngine is by some distance the most developed physics engine 221 ; OpenDynamicsEngine is by some distance the most developed physics engine.
222 ; basicphysics effectively does not model physics at all, making all objects phantom 222 ; BulletSim is a high performance, up-and-coming physics engine.
223 223 ; basicphysics effectively does not model physics at all, making all objects phantom.
224 physics = OpenDynamicsEngine 224 physics = OpenDynamicsEngine
225 ;physics = basicphysics 225 ;physics = basicphysics
226 ;physics = POS 226 ;physics = POS
@@ -364,6 +364,12 @@
364 ; alert_uri = "http://myappserver.net/my_handler/" 364 ; alert_uri = "http://myappserver.net/my_handler/"
365 365
366 366
367[EstateManagement]
368 ; If false, then block any region restart requests from the client even if they are otherwise valid.
369 ; Default is true
370 AllowRegionRestartFromClient = true
371
372
367[SMTP] 373[SMTP]
368 enabled = false 374 enabled = false
369 375
@@ -898,17 +904,33 @@
898 904
899[BulletSim] 905[BulletSim]
900 ; World parameters 906 ; World parameters
901 DefaultFriction = 0.50 907
908 ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
909 ; bulletxna is a managed C# dll. They have comparible functionality.. the c++ is much faster.
910
911 BulletEngine = "bulletunmanaged"
912 ; BulletEngine = "bulletxna"
913
914 ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain. If you're using the bulletxna engine,
915 ; you will want to switch to the heightfield option
916
917 TerrainImplementation = 1
918 ; TerrainImplementation = 0
919
920 DefaultFriction = 0.20
902 DefaultDensity = 10.000006836 921 DefaultDensity = 10.000006836
903 DefaultRestitution = 0.0 922 DefaultRestitution = 0.0
904 Gravity = -9.80665 923 Gravity = -9.80665
905 924
906 TerrainFriction = 0.50 925 TerrainFriction = 0.30
907 TerrainHitFriction = 0.8 926 TerrainHitFraction = 0.8
908 TerrainRestitution = 0 927 TerrainRestitution = 0
928 TerrainCollisionMargin = 0.04
929
909 AvatarFriction = 0.2 930 AvatarFriction = 0.2
931 AvatarStandingFriction = 10.0
910 AvatarRestitution = 0.0 932 AvatarRestitution = 0.0
911 AvatarDensity = 60.0 933 AvatarDensity = 3.5
912 AvatarCapsuleWidth = 0.6 934 AvatarCapsuleWidth = 0.6
913 AvatarCapsuleDepth = 0.45 935 AvatarCapsuleDepth = 0.45
914 AvatarCapsuleHeight = 1.5 936 AvatarCapsuleHeight = 1.5
@@ -916,30 +938,10 @@
916 938
917 MaxObjectMass = 10000.01 939 MaxObjectMass = 10000.01
918 940
919 ; Dynamic parameters 941 CollisionMargin = 0.04
920 LinearDamping = 0.0
921 AngularDamping = 0.0
922 DeactivationTime = 0.2
923 LinearSleepingThreshold = 0.8
924 AngularSleepingThreshold = 1.0
925 CcdMotionThreshold = 0.0
926 CcdSweptSphereRadius = 0.0
927 ContactProcessingThreshold = 0.1
928 ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
929 MaxPersistantManifoldPoolSize = 0
930 ShouldDisableContactPoolDynamicAllocation = False
931 ShouldForceUpdateAllAabbs = False
932 ShouldRandomizeSolverOrder = True
933 ShouldSplitSimulationIslands = True
934 ShouldEnableFrictionCaching = False
935 NumberOfSolverIterations = 0
936 942
937 ; Linkset constraint parameters 943 ; Linkset constraint parameters
938 LinkConstraintUseFrameOffset = False 944 LinkImplementation = 1 ; 0=constraint, 1=compound
939 LinkConstraintEnableTransMotor = True
940 LinkConstraintTransMotorMaxVel = 5.0
941 LinkConstraintTransMotorMaxForce = 0.1
942
943 945
944 ; Whether to mesh sculpties 946 ; Whether to mesh sculpties
945 MeshSculptedPrim = true 947 MeshSculptedPrim = true
@@ -966,6 +968,7 @@
966 PhysicsLoggingEnabled = False 968 PhysicsLoggingEnabled = False
967 PhysicsLoggingDir = "." 969 PhysicsLoggingDir = "."
968 VehicleLoggingEnabled = False 970 VehicleLoggingEnabled = False
971
969 972
970[RemoteAdmin] 973[RemoteAdmin]
971 enabled = false 974 enabled = false
@@ -1116,6 +1119,17 @@
1116 1119
1117 ;exclude_list=User 1,User 2,User 3 1120 ;exclude_list=User 1,User 2,User 3
1118 1121
1122 ;;Shows modal alertbox for entering agent on IRC enabled regions
1123 ;;
1124 ;; Enable Alert, default = false
1125 ;alert_show = false
1126 ;;
1127 ;; Show IRC serverinfo, default = true
1128 ;alert_show_serverinfo = true
1129 ;;
1130 ;alert_msg_pre = "This region is linked to Irc."
1131 ;alert_msg_post = "Everything you say in public chat can be listened."
1132
1119 1133
1120; The following settings control the progression of daytime 1134; The following settings control the progression of daytime
1121; in the Sim. The defaults are the same as the commented out settings 1135; in the Sim. The defaults are the same as the commented out settings
@@ -1297,6 +1311,20 @@
1297 ; script assemblies 1311 ; script assemblies
1298 AppDomainLoading = true 1312 AppDomainLoading = true
1299 1313
1314 ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
1315 ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
1316 ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
1317 ; by scripts have changed.
1318 ; DeleteScriptsOnStartup = false
1319
1320 ; Controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op)
1321 ; co-op will be more stable but this option is currently experimental.
1322 ; If moving from co-op to abort, existing script DLLs will need to be recompiled.
1323 ; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run
1324 ; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
1325 ; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
1326 ScriptStopStrategy = abort
1327
1300 ; Rate to poll for asynchronous command replies (ms) 1328 ; Rate to poll for asynchronous command replies (ms)
1301 ; currently unused 1329 ; currently unused
1302 ;AsyncLLCommandLoopms = 50 1330 ;AsyncLLCommandLoopms = 50
@@ -1367,6 +1395,10 @@
1367 ; If a script overruns it's event limit, kill the script? 1395 ; If a script overruns it's event limit, kill the script?
1368 KillTimedOutScripts = false 1396 KillTimedOutScripts = false
1369 1397
1398 ; Amount of time in milliseconds we will wait for an event to completely normally when a script stop is requested
1399 ; before aborting the thread (such as when an object containing scripts is taken into inventory).
1400 WaitForEventCompletionOnScriptStop = 1000;
1401
1370 ; Sets the multiplier for the scripting delays 1402 ; Sets the multiplier for the scripting delays
1371 ScriptDelayFactor = 1.0 1403 ScriptDelayFactor = 1.0
1372 1404
@@ -1394,12 +1426,6 @@
1394 ;; Path to script assemblies 1426 ;; Path to script assemblies
1395 ; ScriptEnginesPath = "ScriptEngines" 1427 ; ScriptEnginesPath = "ScriptEngines"
1396 1428
1397 ; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
1398 ; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
1399 ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
1400 ; by scripts have changed.
1401 ; DeleteScriptsOnStartup = false
1402
1403 1429
1404[Concierge] 1430[Concierge]
1405 ; Enable concierge module 1431 ; Enable concierge module
@@ -1582,8 +1608,7 @@
1582 1608
1583 ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets. 1609 ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
1584 ; This reduces data churn 1610 ; This reduces data churn
1585 ; This setting is currently experimental and defaults to false. 1611 RecycleBaseUDPPackets = true
1586 RecycleBaseUDPPackets = false;
1587 1612
1588 1613
1589[InterestManagement] 1614[InterestManagement]
diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example
index 54a841d..f5282a7 100644
--- a/bin/Regions/Regions.ini.example
+++ b/bin/Regions/Regions.ini.example
@@ -45,3 +45,4 @@ ExternalHostName = "SYSTEMIP"
45; * 45; *
46 46
47; RegionType = "Mainland" 47; RegionType = "Mainland"
48; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 4ecc6b0..c7d4b7f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -22,6 +22,18 @@
22; * 22; *
23[Startup] 23[Startup]
24 24
25; Plugin Registry Location
26; Set path to directory for plugin registry. Information
27; about the registered repositories and installed plugins
28; will be stored here
29; The Robust.exe process must hvae R/W access to the location
30RegistryLocation = "."
31
32; Modular configurations
33; Set path to directory for modular ini files...
34; The Robust.exe process must hvae R/W access to the location
35ConfigDirectory = "/home/opensim/etc/Configs"
36
25[ServiceList] 37[ServiceList]
26 38
27AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" 39AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
@@ -53,7 +65,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
53;; Additions for other add-on modules. For example: 65;; Additions for other add-on modules. For example:
54;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector" 66;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
55 67
56
57; * This is common for all services, it's the network setup for the entire 68; * This is common for all services, it's the network setup for the entire
58; * server instance, if none is specified above 69; * server instance, if none is specified above
59; * 70; *
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7503c5e..bc5cbcc 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -14,6 +14,19 @@
14; * 14; *
15[Startup] 15[Startup]
16 16
17; Plugin Registry Location
18; Set path to directory for plugin registry. Information
19; about the registered repositories and installed plugins
20; will be stored here
21; The Robust.exe process must hvae R/W access to the location
22RegistryLocation = "."
23
24
25; Modular configurations
26; Set path to directory for modular ini files...
27; The Robust.exe process must hvae R/W access to the location
28ConfigDirectory = "/home/opensim/etc/Configs"
29
17[ServiceList] 30[ServiceList]
18AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" 31AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
19InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" 32InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 79f7ed6..e53fcca 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,11 @@
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 ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
141 ;; and available when they return. True by default.
142 ;RestrictInventoryAccessAbroad = True
143
144
140[HGAssetService] 145[HGAssetService]
141 ; 146 ;
142 ; === HG ONLY === 147 ; === HG ONLY ===
diff --git a/bin/data/LICENSE-README-IMPORTANT.txt b/bin/data/LICENSE-README-IMPORTANT.txt
index 86e401f..a1ac20c 100644
--- a/bin/data/LICENSE-README-IMPORTANT.txt
+++ b/bin/data/LICENSE-README-IMPORTANT.txt
@@ -2,4 +2,4 @@ Not all of the files in this directory are licensed under the BSD license. Some
2 2
3These files are: 3These files are:
4 4
5- avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License) \ No newline at end of file 5- avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License)
diff --git a/bin/data/sim.css b/bin/data/sim.css
new file mode 100644
index 0000000..e584a1a
--- /dev/null
+++ b/bin/data/sim.css
@@ -0,0 +1,85 @@
1body {
2 font-family: Veranda,Arial,Helvetica,sans-serif;
3 font-size: 12px;
4 background: #4A5F6D;
5 color: #EEEAD6;
6 padding: 0px;
7 margin: 0px;
8}
9.footer {
10 font-family: Veranda,Arial,Helvetica,sans-serif;
11 font-size: 10px;
12}
13td {
14 font-family: Veranda,Arial,Helvetica,sans-serif;
15 font-size: 12px;
16 padding: 4px;
17 margin: 4px;
18}
19blockquote {
20 font-family: Veranda,Arial,Helvetica,sans-serif;
21 font-style: italic;
22 font-size: 12px;
23}
24pre {
25 padding: 5px;
26 background-color: #8080B0;
27 color: #000000;
28 margin-left: 20px;
29 font-size: 11px;
30}
31:link {
32 color: #ffffff;
33}
34:visited {
35 color: #d0d0d0;
36}
37.SimSectionHeader {
38 font-size: 120%;
39}
40div.SimSectionContainer {
41 padding: 10px 0px 0px 20px;
42}
43/* SimStats ===================================== */
44#SimSimStats div {
45 margin-left: 20px;
46 background: #3A4F5D;
47}
48#SimSimStats table td {
49 text-align: right;
50 padding: 0px 0px 0px 5px;
51 margin: 0px 0px 0px 0px;
52}
53/* Region Stats ===================================== */
54#SimRegionStats div {
55 margin-left: 20px;
56 background: #3A4F5D;
57}
58#SimRegionStats table {
59 border: 1px;
60 border-style: solid;
61}
62#SimRegionStats table td {
63 text-align: right;
64 padding: 0px 0px 0px 5px;
65 margin: 0px 0px 0px 0px;
66}
67/* Session Stats ===================================== */
68#SimSessionStats div {
69 margin-left: 20px;
70 background: #3A4F5D;
71}
72#SimSessionStats table td {
73 text-align: right;
74 padding: 0px 0px 0px 5px;
75 margin: 0px 0px 0px 0px;
76}
77/* LogFile ===================================== */
78#SimLogFile div {
79 margin-left: 20px;
80}
81#SimLogFile table td {
82 text-align: right;
83 padding: 0px 0px 0px 5px;
84 margin: 0px 0px 0px 0px;
85}
diff --git a/bin/data/sim.html b/bin/data/sim.html
new file mode 100644
index 0000000..82d4789
--- /dev/null
+++ b/bin/data/sim.html
@@ -0,0 +1,291 @@
1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml">
4<head>
5<title>Simulator statistics</title>
6<link rel="stylesheet" href="sim.css" type="text/css"/>
7<!-- <script type="text/javascript" src="jquery.js"></script> -->
8<!-- <script type="text/javascript" src="https://code.jquery.com/jquery-1.9.0.min.js"></script> -->
9<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
10<!-- <script type="text/javascript" src="https://ajax.aspnetcdn.com/ajax/libs/jQuery/jquery-1.9.0.min.js"></script> -->
11<noscript>
12<p color="red">
13Your browser does not support Javascript. This won't work for you.
14</p>
15</noscript>
16<script type="text/javascript">
17$(document).ready(function() {
18 // Major divisions in the content accordioning
19 $('.SimSection').show('slow');
20 $('.SimSectionHeader').click(function() {
21 $(this).next().slideToggle('slow');
22 return false;
23 });
24
25 // Start the timed functions
26 TimerDataStuff();
27});
28
29// One of the sections is viewer statistics. Poll for the data.
30var statTimerHandle;
31var graphFPS;
32var lastFPS = 10;
33var xxThru = 0;
34function TimerDataStuff() {
35 statTimerHandle = setInterval('TimerStatDisplay()', 5000);
36}
37
38// called by timer to fetch and display statistic information
39var doingStatDisplay = false;
40function TimerStatDisplay() {
41 if (doingStatDisplay) return;
42 doingStatDisplay = true;
43 if ($('#SimSimStats').is(':visible')) {
44 DisplaySimStats();
45 }
46 if ($('#SimRegionStats').is(':visible')) {
47 DisplayPerRegionStats();
48 }
49 if ($('#SimSessionStats').is(':visible')) {
50 DisplaySessionStats();
51 }
52 if ($('#SimLogFile').is(':visible')) {
53 DisplayLogFile();
54 }
55 doingStatDisplay = false;
56}
57
58var simName = "127.0.0.1";
59var simPort = "9000";
60function DisplaySimStats() {
61 var statURL = "http://" + simName + ":" + simPort + "/SStats/?json=1";
62 $.ajax({
63 type: "GET",
64 url: statURL,
65 dataType: 'json',
66 timeout: 1000,
67 success: function(data, status) {
68 if (status == 'success') {
69 DisplaySimStatDetails(data);
70 }
71 },
72 error: function(xmlHTTPRequest, errorType) {
73 // DebugLog('Failed fetch');
74 }
75 });
76}
77
78function DisplayPerRegionStats() {
79 var statURL = "http://" + simName + ":" + simPort + "/SStats/simstatsajax.html?json=1";
80 $.ajax({
81 type: "GET",
82 url: statURL,
83 dataType: 'json',
84 timeout: 1000,
85 success: function(data, status) {
86 if (status == 'success') {
87 DisplayRegionStatDetails(data);
88 }
89 },
90 error: function(xmlHTTPRequest, errorType) {
91 // DebugLog('Failed fetch');
92 }
93 });
94};
95
96function DisplayLogFile() {
97 var statURL = "http://" + simName + ":" + simPort + "/SStats/activelogajax.html?json=1";
98 $.ajax({
99 type: "GET",
100 url: statURL,
101 dataType: 'json',
102 timeout: 1000,
103 success: function(data, status) {
104 if (status == 'success') {
105 DisplayLogFileDetails(data);
106 }
107 },
108 error: function(xmlHTTPRequest, errorType) {
109 // DebugLog('Failed fetch');
110 }
111 });
112};
113
114function DisplaySessionStats() {
115 var statURL = "http://" + simName + ":" + simPort + "/SStats/activeconnectionsajax.html?json=1";
116 $.ajax({
117 type: "GET",
118 url: statURL,
119 dataType: 'json',
120 timeout: 1000,
121 success: function(data, status) {
122 if (status == 'success') {
123 DisplaySessionStatsDetails(data);
124 }
125 },
126 error: function(xmlHTTPRequest, errorType) {
127 // DebugLog('Failed fetch');
128 }
129 });
130};
131
132function DisplaySimStatDetails(data) {
133 var simInfo = new StringBuffer();
134 simInfo.append('<table id="RegionStatsTable">');
135 simInfo.append('<tr>');
136 simInfo.append('<th>Total Users</th>');
137 simInfo.append('<th>Total Sessions</th>');
138 simInfo.append('<th>Avg client FPS</th>');
139 simInfo.append('<th>Avg client Mem</th>');
140 simInfo.append('<th>Avg ping time</th>');
141 simInfo.append('<th>KB out</th>');
142 simInfo.append('<th>KB in</th>');
143 simInfo.append('</tr>');
144 simInfo.append('<tr>');
145 simInfo.append('<td>' + data.totalUsers + '</td>');
146 simInfo.append('<td>' + data.totalSessions + '</td>');
147 simInfo.append('<td>' + data.averageClientFPS + '</td>');
148 simInfo.append('<td>' + data.averageClientMem + '</td>');
149 simInfo.append('<td>' + data.averagePingTime + '</td>');
150 simInfo.append('<td>' + data.totalKBOut + '</td>');
151 simInfo.append('<td>' + data.totalKBIn + '</td>');
152 simInfo.append('</tr>');
153 simInfo.append('</table>');
154 $('#SimSimStats').empty();
155 $('#SimSimStats').append(simInfo.toString());
156}
157
158function DisplayRegionStatDetails(data) {
159 var regionInfo = new StringBuffer();
160 regionInfo.append('<table id="RegionStatsTable">');
161 regionInfo.append('<tr>');
162 regionInfo.append('<th>Region</th>');
163 regionInfo.append('<th>Agents</th>');
164 regionInfo.append('<th>Child</th>');
165 regionInfo.append('<th>FPS</th>');
166 regionInfo.append('<th>Frame Time</th>');
167 regionInfo.append('<th>Phys Time</th>');
168 regionInfo.append('<th>Prims</th>');
169 regionInfo.append('</tr>');
170 for (region in data) {
171 regionInfo.append('<tr>');
172 regionInfo.append('<td>' + data[region].region + '</td>');
173 regionInfo.append('<td>' + data[region].rootAgents + '</td>');
174 regionInfo.append('<td>' + data[region].childAgents + '</td>');
175 regionInfo.append('<td>' + data[region].simFPS + '</td>');
176 regionInfo.append('<td>' + data[region].totalFrameTime + '</td>');
177 regionInfo.append('<td>' + data[region].physicsFrameTime + '</td>');
178 regionInfo.append('<td>' + data[region].totalPrims + '</td>');
179 regionInfo.append('</tr>');
180 }
181 regionInfo.append('</table>');
182 $('#SimRegionStats').empty();
183 $('#SimRegionStats').append(regionInfo.toString());
184}
185
186function DisplayLogFileDetails(data) {
187 var logInfo = new StringBuffer();
188 var logPattern = /^(.+),\d\d\d .* \[(.+)\]: (.+)$/;
189 for (logLine in data['logLines']) {
190 logInfo.append('<div>');
191 var logPieces = logPattern.exec(data['logLines'][logLine]);
192 if (logPieces) {
193 logInfo.append(logPieces[1] + ' [' + logPieces[2]
194 + '] ' + logPieces[3]);
195 }
196 else {
197 logInfo.append(data['logLines'][logLine]);
198 }
199
200 logInfo.append('</div>');
201 }
202 $('#SimLogFile').empty();
203 $('#SimLogFile').append(logInfo.toString());
204}
205
206function DisplaySessionStatsDetails(data) {
207 var userInfo = new StringBuffer();
208 userInfo.append('<table>');
209 userInfo.append('<tr>');
210 userInfo.append('<th>region</th>');
211 userInfo.append('<th>user</th>');
212 userInfo.append('<th></th>');
213 userInfo.append('<th>position</th>');
214 userInfo.append('</tr>');
215 for (region in data) {
216 for (user in data[region]) {
217 if (user != 'queues') {
218 userInfo.append('<tr>');
219 userInfo.append('<td>' + region + '</td>');
220 userInfo.append('<td>' + data[region][user].Name + '</td>');
221 if (data[region][user].isRoot == 'true') {
222 userInfo.append('<td>root</td>');
223 }
224 else {
225 userInfo.append('<td>child</td>');
226 }
227 userInfo.append('<td>' + data[region][user].position + '</td>');
228 userInfo.append('</tr>');
229 }
230 }
231 }
232 userInfo.append('</table>');
233 $('#SimSessionStats').empty();
234 $('#SimSessionStats').append(userInfo.toString());
235}
236
237function DebugLog(msg) {
238 $("#DEBUG").append('<div>' + msg + '</div>');
239 $("#DEBUG").show();
240}
241
242function StringBuffer() {
243 this.__strings__ = new Array;
244}
245StringBuffer.prototype.append = function(str) {
246 this.__strings__.push(str);
247}
248StringBuffer.prototype.toString = function() {
249 return this.__strings__.join("");
250}
251
252</script>
253</head>
254<body id="SimBody">
255<div id="SimHeader"></div>
256<div id="SimContent">
257
258<!-- ============================================== -->
259<div class="SimSectionContainer">
260<a class="SimSectionHeader" href="#">Simulator Stats</a>
261<div id="SimSimStats" class="SimSection">
262</div> <!-- SimSimStats -->
263</div> <!-- SimSectionContainer -->
264
265<!-- ============================================== -->
266<div class="SimSectionContainer">
267<a class="SimSectionHeader" href="#">Region Stats</a>
268<div id="SimRegionStats" class="SimSection">
269</div> <!-- SimRegionStats -->
270</div> <!-- SimSectionContainer -->
271
272<!-- ============================================== -->
273<div class="SimSectionContainer">
274<a class="SimSectionHeader" href="#">Sessions</a>
275<div id="SimSessionStats" class="SimSection">
276</div> <!-- SimSessionStats -->
277</div> <!-- SimSectionContainer -->
278
279<!-- ============================================== -->
280<div class="SimSectionContainer">
281<a class="SimSectionHeader" href="#">Log File</a>
282<div id="SimLogFile" class="SimSection">
283</div> <!-- SimLogFile -->
284</div> <!-- SimSectionContainer -->
285
286<!-- ============================================== -->
287</div> <!-- SimContent -->
288<div id="DEBUG"></div>
289<div id="SimFooter"></div>
290</body>
291</html>
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 2ae1c75..24dffac 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 d4852a5..7e3ed20 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 77cf7e3..808f433 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 4ec62b2..9382751 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ