diff options
Diffstat (limited to '')
-rwxr-xr-x | bin/MsgPack.dll | bin | 0 -> 37376 bytes | |||
-rw-r--r-- | bin/OpenSim.Region.PhysicsModule.ubOde.dll.config | 7 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 25 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 71 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/defaultalpha.jp2 | bin | 0 -> 319 bytes | |||
-rw-r--r-- | bin/enter_uuid.xml | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | bin/lib32/libode.so | bin | 3051566 -> 3134141 bytes | |||
-rwxr-xr-x | bin/lib32/ode.dll | bin | 496640 -> 541696 bytes | |||
-rwxr-xr-x | bin/lib64/ode.dll | bin | 656384 -> 637952 bytes | |||
-rw-r--r-- | bin/set_object_owner.xml | 8 |
10 files changed, 75 insertions, 43 deletions
diff --git a/bin/MsgPack.dll b/bin/MsgPack.dll new file mode 100755 index 0000000..90e6b7b --- /dev/null +++ b/bin/MsgPack.dll | |||
Binary files differ | |||
diff --git a/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config b/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config new file mode 100644 index 0000000..c72c281 --- /dev/null +++ b/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config | |||
@@ -0,0 +1,7 @@ | |||
1 | <configuration> | ||
2 | <dllmap os="osx" dll="ode" target="lib64/libode.dylib" /> | ||
3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="lib64/libode-x86_64" /> | ||
4 | <dllmap os="!windows,osx" cpu="x86" dll="ode" target="lib32/libode" /> | ||
5 | <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="lib64/libode-ppc64" /> | ||
6 | <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="lib64/libode-s390x" /> | ||
7 | </configuration> | ||
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index d395efe..e4adb7f 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -142,10 +142,6 @@ | |||
142 | ;; from the selected region_info_source. | 142 | ;; from the selected region_info_source. |
143 | ; allow_regionless = false | 143 | ; allow_regionless = false |
144 | 144 | ||
145 | ;# {MaxPrimUndos} {} {Maximum number of undos avialable for position, rotation and scale changes of each prim} {} 20 | ||
146 | ;; Increasing the number of undos available number will increase memory usage. | ||
147 | MaxPrimUndos = 20 | ||
148 | |||
149 | ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001 | 145 | ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001 |
150 | ;; Minimum size for non-physical prims. Affects resizing of existing | 146 | ;; Minimum size for non-physical prims. Affects resizing of existing |
151 | ;; prims. This can be overridden in the region config file (as | 147 | ;; prims. This can be overridden in the region config file (as |
@@ -248,7 +244,9 @@ | |||
248 | ;; Default is Meshmerizer | 244 | ;; Default is Meshmerizer |
249 | ; meshing = Meshmerizer | 245 | ; meshing = Meshmerizer |
250 | ; meshing = ZeroMesher | 246 | ; meshing = ZeroMesher |
251 | 247 | ;; select ubODEMeshmerizer only with ubOde physics engine | |
248 | ; meshing = ubODEMeshmerizer | ||
249 | |||
252 | ;; Choose one of the physics engines below | 250 | ;; Choose one of the physics engines below |
253 | ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim | 251 | ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim |
254 | ;; BulletSim is the default physics engine. It provides the best performance and most functionality. | 252 | ;; BulletSim is the default physics engine. It provides the best performance and most functionality. |
@@ -261,6 +259,8 @@ | |||
261 | ; physics = BulletSim | 259 | ; physics = BulletSim |
262 | ; physics = basicphysics | 260 | ; physics = basicphysics |
263 | ; physics = POS | 261 | ; physics = POS |
262 | ;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also | ||
263 | ; physics = ubODE | ||
264 | 264 | ||
265 | ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine | 265 | ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine |
266 | ;; Default script engine to use. Currently, we only have XEngine | 266 | ;; Default script engine to use. Currently, we only have XEngine |
@@ -695,7 +695,6 @@ | |||
695 | ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics) | 695 | ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics) |
696 | ; use_NINJA_physics_joints = false | 696 | ; use_NINJA_physics_joints = false |
697 | 697 | ||
698 | |||
699 | [RemoteAdmin] | 698 | [RemoteAdmin] |
700 | ;; This is the remote admin module, which uses XMLRPC requests to | 699 | ;; This is the remote admin module, which uses XMLRPC requests to |
701 | ;; manage regions from a web interface. | 700 | ;; manage regions from a web interface. |
@@ -1114,6 +1113,20 @@ | |||
1114 | [NPC] | 1113 | [NPC] |
1115 | ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false | 1114 | ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false |
1116 | ; Enabled = false | 1115 | ; Enabled = false |
1116 | |||
1117 | ;; several options to control NPCs creation | ||
1118 | |||
1119 | ;; allow NPCs to be created not Owned {true false} default: true | ||
1120 | ; AllowNotOwned = false | ||
1121 | |||
1122 | ;; allow NPCs to set to be sensed as Avatars {true false} default: true | ||
1123 | ; AllowSenseAsAvatar = false | ||
1124 | |||
1125 | ;; allow NPCs to created cloning any avatar in region {true false} default: true | ||
1126 | ; AllowCloneOtherAvatars = false | ||
1127 | |||
1128 | ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true | ||
1129 | ; NoNPCGroup = false | ||
1117 | 1130 | ||
1118 | 1131 | ||
1119 | [Terrain] | 1132 | [Terrain] |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a99608c..f1d6f84 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -176,11 +176,14 @@ | |||
176 | ; You can choose to show the true physics FPS to viewers by setting Normalized55FPS to false. | 176 | ; You can choose to show the true physics FPS to viewers by setting Normalized55FPS to false. |
177 | ; Normalized55FPS = true | 177 | ; Normalized55FPS = true |
178 | 178 | ||
179 | ; The minimum proportion of a second that any particular frame can take to execute. | 179 | ; Main Frame time |
180 | ; Only change this if you really know what you're doing, and be prepared to change UpdatePhysicsEveryNFrames | 180 | ; This defines the rate of several simulation events. |
181 | ; (and other Frames params) to match! For instance, halving MinFrameTime to 0.0445 require | 181 | ; Default value should meet most needs. |
182 | ; UpdatePhysicsEveryNFrames = 2 unless you don't mind your avatar walking like Benny Hill. | 182 | ; It can be reduced to improve the simulation of moving objects, with possible increase of cpu and network loads. |
183 | MinFrameTime = 0.089 | 183 | ; It should not be less than the physics engine step time. |
184 | ; Being a integer multiple of it may reduce some jitter in reported physics FPS. | ||
185 | ; changing this value, you need to change some of the following *EveryNFrames so their actions timing remains the same | ||
186 | FrameTime = 0.0909 | ||
184 | 187 | ||
185 | ; The values below represent the percentage of the target frame time that, | 188 | ; The values below represent the percentage of the target frame time that, |
186 | ; when underrun, should trigger yellow or red in the lag meter. | 189 | ; when underrun, should trigger yellow or red in the lag meter. |
@@ -189,24 +192,24 @@ | |||
189 | ; encouraged that they do. | 192 | ; encouraged that they do. |
190 | ; FrameTimeWarnPercent = 60; | 193 | ; FrameTimeWarnPercent = 60; |
191 | ; FrameTimeCritPercent = 40; | 194 | ; FrameTimeCritPercent = 40; |
192 | 195 | ||
193 | ; Send scheduled updates to objects in the scene | 196 | ; Send scheduled updates to objects in the scene |
194 | ; This must be a whole number | 197 | ; This must be a whole number |
195 | UpdateObjectsEveryNFrames = 1; | 198 | UpdateObjectsEveryNFrames = 1; |
196 | 199 | ||
197 | ; Send position/velocity, etc. updates to agents in the scene | 200 | ; Send position/velocity, etc. updates to agents in the scene |
198 | ; This must be a whole number | 201 | ; This must be a whole number |
199 | UpdateAgentsEveryNFrames = 1; | 202 | UpdateAgentsEveryNFrames = 1; |
200 | 203 | ||
201 | ; Apply pending forces from physics calculations to an entity. | 204 | ; Apply pending forces from physics calculations to an entity. |
202 | ; This must be a whole number | 205 | ; This must be a whole number |
203 | UpdateEntityMovementEveryNFrames = 1; | 206 | UpdateEntityMovementEveryNFrames = 1; |
204 | 207 | ||
205 | ; Send coarse location updates to viewers. In a classic viewer, this updates the minimap. | 208 | ; Send coarse location updates to viewers. In a classic viewer, this updates the minimap. |
206 | ; This must be a whole number | 209 | ; This must be a whole number |
207 | UpdateCoarseLocationsEveryNFrames = 50; | 210 | UpdateCoarseLocationsEveryNFrames = 50; |
208 | 211 | ||
209 | ; Update physics. Within each update physics also updates in a series of contigous mini-steps | 212 | ; Physics simulation execution or syncronization, acording to engine. Should be 1 |
210 | ; This must be a whole number | 213 | ; This must be a whole number |
211 | UpdatePhysicsEveryNFrames = 1; | 214 | UpdatePhysicsEveryNFrames = 1; |
212 | 215 | ||
@@ -609,7 +612,7 @@ | |||
609 | ; clients login by starting each connection more slowly. Disabled by | 612 | ; clients login by starting each connection more slowly. Disabled by |
610 | ; default | 613 | ; default |
611 | ; | 614 | ; |
612 | enable_adaptive_throttles = true | 615 | enable_adaptive_throttles = false |
613 | 616 | ||
614 | ; Per-client bytes per second rates for the various throttle categories. | 617 | ; Per-client bytes per second rates for the various throttle categories. |
615 | ; These are default values that will be overridden by clients. These | 618 | ; These are default values that will be overridden by clients. These |
@@ -908,19 +911,24 @@ | |||
908 | ; Max value is 255, min value is 0 | 911 | ; Max value is 255, min value is 0 |
909 | avatar_terminal_velocity = 54 | 912 | avatar_terminal_velocity = 54 |
910 | 913 | ||
911 | ; World Step size. (warning these are dangerous. Changing these will probably cause your scene to explode dramatically) | 914 | ; World Step size. |
912 | ; reference: fps = (0.089/ODE_STEPSIZE) * 1000; | 915 | ; with legacy ODE this value needs to be close to 0.02s |
913 | world_stepsize = 0.0178 | 916 | ; with ubOde this value can be reduced to improve simulation quality with the cost of higher cpu load |
914 | world_internal_steps_without_collisions = 10 | 917 | ; you will need to test acording to you needs |
918 | ; choosing a value that is a integer sub multiple of FrameRate reduces some jitter on reported physics FPS | ||
919 | world_stepsize = 0.01818 | ||
920 | ; number of iterations of constrains solver, higher should improve results | ||
921 | ; up to a point where acumulated math errors eliminate the improvement | ||
922 | ; more steps may increase CPU load. No real gain in changing | ||
923 | world_solver_iterations = 10 | ||
924 | |||
925 | ;Spaces level settings. Affects memory consumption vs Collider CPU time for avatar and physical prim | ||
926 | ; defines spaces partition cells min and max sizes == 2^value | ||
927 | world_hashspace_level_low = -5 | ||
928 | world_hashSpace_level_high = 12 | ||
915 | 929 | ||
916 | ;World Space settings. Affects memory consumption vs Collider CPU time for avatar and physical prim | ||
917 | world_hashspace_size_low = -4 | ||
918 | world_hashSpace_size_high = 128 | ||
919 | |||
920 | ;Dynamic space settings Affects memory consumption vs Collider CPU time for static prim | ||
921 | meters_in_small_space = 29.9 | 930 | meters_in_small_space = 29.9 |
922 | small_hashspace_size_low = -4 | 931 | |
923 | small_hashspace_size_high = 66 | ||
924 | 932 | ||
925 | ; ## | 933 | ; ## |
926 | ; ## Contact properties. (the stuff that happens when things come in contact with each other) | 934 | ; ## Contact properties. (the stuff that happens when things come in contact with each other) |
@@ -959,18 +967,14 @@ | |||
959 | ; desired velocity | 967 | ; desired velocity |
960 | ; See http://en.wikipedia.org/wiki/PID_controller | 968 | ; See http://en.wikipedia.org/wiki/PID_controller |
961 | 969 | ||
962 | av_pid_derivative_linux = 2200.0 | 970 | av_pid_derivative = 2200.0 |
963 | av_pid_proportional_linux = 900.0; | 971 | av_pid_proportional = 900.0; |
964 | |||
965 | av_pid_derivative_win = 2200.0 | ||
966 | av_pid_proportional_win = 900.0; | ||
967 | 972 | ||
968 | ;girth of the avatar. Adds radius to the height also | 973 | ;girth of the avatar. Adds radius to the height also |
969 | av_capsule_radius = 0.37 | 974 | av_capsule_radius = 0.37 |
970 | 975 | ||
971 | ; Max force permissible to use to keep the avatar standing up straight | 976 | ; Max force permissible to use to keep the avatar standing up straight |
972 | av_capsule_standup_tensor_win = 550000 | 977 | av_capsule_standup_tensor = 550000 |
973 | av_capsule_standup_tensor_linux = 550000 | ||
974 | 978 | ||
975 | ; specifies if the capsule should be tilted (=true; old compatibility mode) | 979 | ; specifies if the capsule should be tilted (=true; old compatibility mode) |
976 | ; or straight up-and-down (=false; better and more consistent physics behavior) | 980 | ; or straight up-and-down (=false; better and more consistent physics behavior) |
@@ -1022,19 +1026,12 @@ | |||
1022 | ; maximum number of contact points to generate per collision | 1026 | ; maximum number of contact points to generate per collision |
1023 | contacts_per_collision = 80 | 1027 | contacts_per_collision = 80 |
1024 | 1028 | ||
1025 | ; amount of time a geom/body will try to cross a region border before it gets disabled | ||
1026 | geom_crossing_failures_before_outofbounds = 5 | ||
1027 | |||
1028 | ; start throttling the object updates if object comes in contact with 3 or more other objects | 1029 | ; start throttling the object updates if object comes in contact with 3 or more other objects |
1029 | geom_contactpoints_start_throttling = 3 | 1030 | geom_contactpoints_start_throttling = 3 |
1030 | 1031 | ||
1031 | ; send 1 update for every x updates below when throttled | 1032 | ; send 1 update for every x updates below when throttled |
1032 | geom_updates_before_throttled_update = 15 | 1033 | geom_updates_before_throttled_update = 15 |
1033 | 1034 | ||
1034 | ; Used for llSetStatus. How rigid the object rotation is held on the axis specified | ||
1035 | body_motor_joint_maxforce_tensor_linux = 5 | ||
1036 | body_motor_joint_maxforce_tensor_win = 5 | ||
1037 | |||
1038 | ; Maximum mass an object can be before it is clamped | 1035 | ; Maximum mass an object can be before it is clamped |
1039 | maximum_mass_object = 10000.01 | 1036 | maximum_mass_object = 10000.01 |
1040 | 1037 | ||
@@ -1940,7 +1937,7 @@ | |||
1940 | GroupsCacheTimeout = 30 | 1937 | GroupsCacheTimeout = 30 |
1941 | 1938 | ||
1942 | ; Specify which messaging module to use for groups messaging and if it's enabled | 1939 | ; Specify which messaging module to use for groups messaging and if it's enabled |
1943 | MessagingModule = GroupsMessagingModule | 1940 | ;MessagingModule = GroupsMessagingModule |
1944 | ;MessagingEnabled = true | 1941 | ;MessagingEnabled = true |
1945 | 1942 | ||
1946 | ; Experimental option to only message cached online users rather than all users | 1943 | ; Experimental option to only message cached online users rather than all users |
diff --git a/bin/assets/TexturesAssetSet/defaultalpha.jp2 b/bin/assets/TexturesAssetSet/defaultalpha.jp2 new file mode 100644 index 0000000..af73c1e --- /dev/null +++ b/bin/assets/TexturesAssetSet/defaultalpha.jp2 | |||
Binary files differ | |||
diff --git a/bin/enter_uuid.xml b/bin/enter_uuid.xml new file mode 100644 index 0000000..84475ad --- /dev/null +++ b/bin/enter_uuid.xml | |||
@@ -0,0 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" height="100" name="enter_uuid" title="ID Required" width="390"> | ||
3 | <text bottom="-30" left="10">Enter UUID</text> | ||
4 | <line_editor bottom="-60" left="10" width="370" name="new_owner" height="20"/> | ||
5 | <button bottom="-90" width="80" height="20" left="300" label="OK" name="ok" /> | ||
6 | <button bottom="-90" width="80" height="20" left="210" label="Cancel" name="cancel" /> | ||
7 | </floater> | ||
diff --git a/bin/lib32/libode.so b/bin/lib32/libode.so index 6bb85fb..5b110ae 100644..100755 --- a/bin/lib32/libode.so +++ b/bin/lib32/libode.so | |||
Binary files differ | |||
diff --git a/bin/lib32/ode.dll b/bin/lib32/ode.dll index f310358..8457e50 100755 --- a/bin/lib32/ode.dll +++ b/bin/lib32/ode.dll | |||
Binary files differ | |||
diff --git a/bin/lib64/ode.dll b/bin/lib64/ode.dll index df3a6c4..f47ae31 100755 --- a/bin/lib64/ode.dll +++ b/bin/lib64/ode.dll | |||
Binary files differ | |||
diff --git a/bin/set_object_owner.xml b/bin/set_object_owner.xml new file mode 100644 index 0000000..6d9bb8a --- /dev/null +++ b/bin/set_object_owner.xml | |||
@@ -0,0 +1,8 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" height="100" name="set_owner_name" title="Set Owner Name" width="390"> | ||
3 | <text bottom="-30" left="10">New Owner Name</text> | ||
4 | <line_editor enabled="false" bottom="-60" left="10" width="280" name="new_owner" height="20"/> | ||
5 | <button bottom_delta="0" left="300" height="20" width="80" label="Choose" name="picker"/> | ||
6 | <button bottom="-90" width="80" height="20" left="300" label="OK" name="ok" /> | ||
7 | <button bottom="-90" width="80" height="20" left="210" label="Cancel" name="cancel" /> | ||
8 | </floater> | ||