Justin Clark-Casey (justincc)
2b60a5c5d6
Add is_megaregion flag into oar control file. Not currently read - for future use. Please do not rely on this remaining here.
...
An adaptation of part of Garmin's patch from http://opensimulator.org/mantis/view.php?id=5975 , thanks!
Flag only written if the SW corner OAR is saved - this is the only one that captures object data presently (though not land or terrain data).
This adds an IRegionCombinerModule interface and the necessary methods on RegionCombinerModule
2012-05-19 02:45:17 +01:00
ubit
b94ed8e1cf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 03:05:16 +02:00
UbitUmarov
9ecdef2686
modulate collision sound intensity with collision relative velocity for parts also
2012-05-19 02:04:10 +01:00
ubit
3a07220111
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 02:11:56 +02:00
UbitUmarov
98a2c7bfee
modulate collision sounds intensity with relative collision speed
2012-05-19 01:10:39 +01:00
BlueWall
247a56593f
Further refinement on properties
2012-05-18 20:02:32 -04:00
UbitUmarov
deb87e7890
fix character IsPhysical
2012-05-19 01:01:46 +01:00
BlueWall
e338c15433
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-18 19:34:19 -04:00
BlueWall
895dadbdbd
Cleanup + change properties to set fields with private set : Thanks Justin for the tip.
2012-05-18 19:34:12 -04:00
ubit
294cbca5e6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-19 01:21:39 +02:00
UbitUmarov
a7ece8c688
add colliders relative velocity projected in collision direction to collisions report information.
2012-05-19 00:17:37 +01:00
Justin Clark-Casey (justincc)
9fa0577c7e
Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This appears to be required now for LL 3.3.1 to work properly.
...
Without this, LL 3.3.1 continually pushes LLInventoryModelFetchDescendentsResponder::error 499 to its log.
This cap will be ignored by older viewers - UDP inventory will work normally.
2012-05-19 00:00:52 +01:00
Justin Clark-Casey (justincc)
fc5d274229
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-18 23:56:44 +01:00
Justin Clark-Casey (justincc)
896cd45939
Fix issue where a new outfit folder is not created when a new outfit is saved if there are no previous outfits
...
This was because AddFolder() was disallowing these though they are legal.
2012-05-18 23:55:18 +01:00
BlueWall
c05f87b50c
Provide Telehub setting to allow use of landmarks
...
Setting to allow use of landmarks to override telehub routing. Default is off.
2012-05-18 17:51:38 -04:00
Justin Clark-Casey (justincc)
0147dc6302
Fix build break. Comment out EQG deregister/register logging.
2012-05-18 03:50:23 +01:00
Justin Clark-Casey (justincc)
90722875e8
Add millisecond logging to pCampBot for debugging purposes
2012-05-18 03:44:31 +01:00
Justin Clark-Casey (justincc)
45af29291a
Add level 2 debug eq logging which logs event queue polls.
...
Refactor: eq message logging into common method.
2012-05-18 03:43:36 +01:00
Justin Clark-Casey (justincc)
565c73751c
Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte logging
2012-05-18 00:49:39 +01:00
Justin Clark-Casey (justincc)
6501b1b1bb
refactor: move EventQueueGet path generation into common method. Rename some local variables in line with code conventions. Add commented out EQG log lines for future use.
2012-05-18 00:38:29 +01:00
Justin Clark-Casey (justincc)
b18c8c8e78
Don't eagerly clear frame collision events when physics actors subscribe and unsubscribe from collisions, in order to avoid a race condition.
...
Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop.
There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar).
This matches existing behaviour in OdePrim
2012-05-17 23:59:43 +01:00
Justin Clark-Casey (justincc)
521ad080f1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-17 23:56:36 +01:00
Justin Clark-Casey (justincc)
4d34763f8c
Check agent limit against root agent count rather than both root and child agents
...
From sl docs such as http://community.secondlife.com/t5/English-Knowledge-Base/Managing-Private-Regions/ta-p/700115
agent should apply to avatars only.
This makes sense from a user perspective, and also from a code perspective since child agents with no physics or actions take up a fraction of root agent resources.
As such, the check is now only performed in Scene.QueryAccess() - cross and teleport check this before allowing an agent to translocate.
This also removes an off-by-one error that could occur in certain circumstances on teleport when a new child agent was double counted when a pre-teleport agent update was performed.
This does not affect an existing bug where limits or other QueryAccess() checks are not applied to avatars logging directly into a region.
2012-05-17 23:33:26 +01:00
UbitUmarov
0d0c472181
removed redundant colision sounds. Temporary muted sounds ( returns at top of funtions ).
2012-05-17 23:15:07 +01:00
Melanie
24b35b7e93
Merge branch 'ubitwork' into avination
...
Conflicts:
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
2012-05-17 22:29:44 +02:00
Melanie
511fc663a2
Temprorarily disable collision sounds until we have some sound bites
2012-05-17 21:36:27 +02:00
Melanie
b4cd8b491b
Merge branch 'avination' into careminster
2012-05-17 13:34:47 +01:00
Melanie
34f20b7fe3
Merge branch 'master' into careminster
2012-05-17 13:28:25 +01:00
ubit
6bee67aca0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-17 14:23:00 +02:00
UbitUmarov
7652b3a957
udp transfer: make number packets estimation coerent with number actually sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
2012-05-17 13:13:31 +01:00
ubit
7ba34f29ef
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-17 13:21:20 +02:00
UbitUmarov
6af78836a5
trigger collision sounds on active agent position for better spatial effect without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code
2012-05-17 12:17:29 +01:00
BlueWall
2af11fea37
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-05-17 00:49:33 -04:00
BlueWall
295bb3227d
Force the default Telehub router if no matches are found in the config.
2012-05-17 00:47:19 -04:00
ubit
b8a71c1195
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-17 05:43:24 +02:00
UbitUmarov
e4231e95a9
increase avatars collisions report to 10 per sec, Stopped sound on avatar to volumedetect collision
2012-05-17 04:41:46 +01:00
BlueWall
bd39f5f803
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-16 23:20:37 -04:00
BlueWall
0aa7baf49a
Fix boo-boo in OpenSim.ini.example affecting telehub sequential routing
...
Configuration value should be "sequence" instead of "sequential"
2012-05-16 23:17:42 -04:00
ubit
8411d7f356
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-17 05:16:51 +02:00
UbitUmarov
038986baff
add avatar colision sounds. Changed test sound UUID
2012-05-17 04:14:13 +01:00
Justin Clark-Casey (justincc)
c45b5a3d1c
minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:27:05 +01:00
Justin Clark-Casey (justincc)
d19fb6fb0c
Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:12:31 +01:00
ubit
1a32d27879
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-17 02:37:57 +02:00
UbitUmarov
b743835f9e
default colisionVolume is 0, use it only for user specified sound
2012-05-17 01:36:42 +01:00
Justin Clark-Casey (justincc)
f0c9cb8dc0
Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression test logging accidentally left in
2012-05-17 01:34:04 +01:00
Justin Clark-Casey (justincc)
6b6a00a3d5
minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator because checking EstateOwner == user
...
Due to an earlier check we already know that user != UUID.Zero so if EstateOwner == UUID.Zero, EstateOwner == user can never be true
2012-05-17 01:30:50 +01:00
Justin Clark-Casey (justincc)
bdcf2d1348
Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()
2012-05-17 01:27:59 +01:00
ubit
845f8423e4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-17 02:05:46 +02:00
UbitUmarov
7cbc54d92a
default collision sounds. Incomplete, untested, needs revision
2012-05-17 01:04:30 +01:00
Justin Clark-Casey (justincc)
e444cb9da4
Remove redundant "Teleport failed:" from reason when QueryAccess fails for the destination simulator. This part of the string is already provided by the viewer.
...
Also adds more reason logging for diagnostics when teleports are refused/fail.
2012-05-17 00:33:04 +01:00