9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
6560d80fa8
* Fix walking to <NaN, NaN, NaN> via autopilot.
2013-02-16 22:54:37 -05:00
12f732fd3f
Merge branch 'master' into careminster
2013-02-10 20:01:51 +00:00
6f3dcf58b8
Fix code to check for no spawn points. Possibly a merge artefact?
2013-02-10 20:00:39 +00:00
adedd70c35
Fix teleport/telehub issue:
...
Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
2013-02-10 13:01:33 -05:00
8b78b9429d
Merge branch 'avination' into careminster
2013-02-07 21:26:55 +00:00
598f891d70
Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP
2013-02-06 04:03:32 +01:00
7482ad1c22
Merge branch 'master' into careminster
2013-02-04 19:21:39 +00:00
d8d4e7f236
Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.
2013-02-01 15:42:24 -05:00
bfe0f5d081
* This adds a bit more to the previous flying roll effect by adding additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
2013-01-31 20:38:14 +00:00
cc1781926b
* Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff.
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 20:37:58 +00:00
9a4de546fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 02:53:11 +00:00
52ea6eadae
* This adds a bit more to the previous flying roll effect by adding additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
2013-01-30 07:34:48 -05:00
7c4e0ff03c
* Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff.
2013-01-30 06:22:05 -05:00
cc4cfd9fa8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
2013-01-23 02:38:59 +00:00
12efac494a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
2013-01-19 02:38:04 +00:00
fc6115f777
Check the existing ScenePresence.ParentPart to make sure we're not trying to sit on a prim we're already sat upon, rather than looking up the part from scratch.
...
An adaptation of commit 055b8a2
2013-01-19 02:29:02 +00:00
74256c0cc4
Restore previous client AO behaviour by not allowing them to remove the default animation but continue to allow scripts to do so.
...
This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327
and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483
Animations may still exhibit different behaviour if both scripts and clients are adjusting animations.
A change in the behaviour of client AO to not remove all animations may be a better long term approach.
2013-01-18 22:57:09 +00:00
755e452342
revert the test, sending again appearance to self in
...
ValidateAndSendAppearanceAndAgentData()
2013-01-17 03:29:38 +00:00
2743565f7e
*TEST TEST TEST* don't send AvatarAppearance to self
2013-01-17 02:43:29 +00:00
70fa41863d
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
2013-01-16 01:13:14 +00:00
055b8a2d58
move resit fix to ScenePresence.cs and allow for requesting sit on objects other than the object currently sat on
2013-01-14 22:24:24 -08:00
aecb32b74e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-01-10 01:25:07 +00:00
0aabb93ef3
Remove now superfluous update of m_lastSize
2013-01-08 14:00:40 +01:00
e1cfa846ea
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 13:58:42 +01:00
fb088a48ac
also update m_lastSize in SendAvatarDataToAllAgents so more paths update
...
it
2013-01-08 14:09:01 +00:00
ef8f03b711
Prevent avatar data from being sent during login when it's not valid and
...
crashes login on some viewers.
2013-01-08 13:57:45 +01:00
09d41f4f78
Revert "Remove sending AvatarData because this also happens on login, where it chokes"
...
This reverts commit d1fa650c3f
2013-01-08 13:11:04 +01:00
4cd1fd7485
Merge branch 'ubitwork' into avination
2013-01-08 12:14:01 +01:00
d1fa650c3f
Remove sending AvatarData because this also happens on login, where it chokes
...
Firestorm, Singularity and other viewers with the new appearance pipeline.
2013-01-08 12:08:34 +01:00
126e73c5ed
put back position and rot change check before sending releasing plane constrain
2013-01-08 02:29:21 +00:00
1bf553fd65
reduce sampling of camera raycasts to previus value
2013-01-08 01:12:00 +00:00
d5066ae678
* DAnger, TEST * change camera plane collision detection. Still bounces on
...
* prim edges due to camera lag
2013-01-08 00:21:09 +00:00
ca40e656ab
in raycast for camera exclude self detection
2013-01-07 10:35:55 +00:00
083ac92b34
Merge branch 'avination' into careminster
2013-01-06 10:52:22 +00:00
a285ff7e69
check land permitions on sit target for unscripted sits
2013-01-03 14:27:21 +00:00
1665a0d636
make ResetMoveToTarget cancel any 'force' waiting to be applied to avatar
...
( by the odd use of Velocity)
2013-01-03 03:29:40 +00:00
d40cdd2649
cancel MoveToTarget (viewer 'go here") on sits
2013-01-03 02:25:27 +00:00
7980a1d849
*TEST* avatar unscripted sit. Some guessing/automation
2013-01-02 19:39:46 +00:00
7e98dfd70b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-12-30 03:43:51 +00:00
fdf8732cd7
ScenePresence passes the avatar rotation down to the physics engine. This will be a no-op for ODE but enables asymmetrical avatars for BulletSim.
2012-12-28 16:29:16 -08:00
3ab1bd0403
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-12-28 08:32:34 +00:00
5afab9bcfe
Add check to always push terse updates for presences that have new velocities of zero.
2012-12-27 22:12:27 -08:00
2313a86e32
Merge branch 'ubitwork' into avination
2012-12-22 01:04:49 +01:00
77cc7ce399
* Partial Commit for Avatar Appearance to include the functionality of Cached Bakes.
2012-12-21 19:12:30 -05:00
f9051c22d8
* Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to synchronize with Agni.
2012-12-19 22:14:20 -05:00
79bdf464d3
Merge branch 'avination' into careminster
2012-12-18 09:48:12 +00:00
9089bc7e37
some clean up/fix
2012-12-17 22:11:29 +00:00
d003aa2e7b
* TEST * unscripted sit
2012-12-17 01:40:48 +00:00
0a876a305c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-12-16 21:19:30 +00:00
88b094cbf7
Simplify sit code a bit by determining correct animation in HandleSit instead of HandleSitRequest. This eliminates m_nextSitAnimation, an unneeded state-saving variable in ScenePresence
2012-12-13 13:05:28 -08:00
5ad424a792
right fix this time ??
2012-12-13 07:48:29 +00:00
94a659a9e0
fix the 'fix'
2012-12-13 07:46:33 +00:00
c0368f4143
fix coment out code not in use
2012-12-13 07:39:10 +00:00
b3a77c16bd
FIX small avatars movement on terrain. (avatar appearance getting even
...
more messy)
2012-12-13 07:34:27 +00:00
c73c2fb070
add some default size setting and checks
2012-12-07 21:53:33 +00:00
93bede4e6a
revert the use of avatar skeleton and use avatar size provided by viewers,
...
since at least for now seems good enought
2012-12-07 21:26:58 +00:00
2ea0dc55d7
create a new ode character also with the new information
2012-12-07 20:06:35 +00:00
d2499c4c31
*TEST* Use new avatar size in ubitODE.
2012-12-07 15:54:46 +00:00
de3180a63e
avatar collision plane send to viewer is only relative to feet. change
...
avatar collider, just rounding the boxes, etc
2012-12-05 23:19:18 +00:00
8aa5fdb6a3
*TEST* diferent avatar collider
2012-12-03 19:45:45 +01:00
45eedb635a
Merge branch 'master' into careminster
2012-11-20 20:25:15 +00:00
597a101b9f
Minor formatting for 0962a35d and a few one-line comments as to why that code is there
2012-11-20 05:09:44 +00:00
0962a35d2f
Fix movetotarget on mega regions.
2012-11-20 04:54:13 +00:00
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
4fa088bafb
Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
2012-11-04 22:57:24 -05:00
d0473b73da
Merge branch 'master' into careminster
2012-11-03 15:38:47 +00:00
2e106cd5de
Change to earlier commit for TargetVelocity to support distributed physics.
2012-11-02 03:09:04 -07:00
e7a6328ea4
Merge branch 'master' into careminster
2012-11-01 15:52:32 +00:00
ffe4d738fb
Add TargetVelocity to PhysicsActor interface to support distributed physics. No change to existing functions.
2012-10-31 17:13:18 -07:00
28a4ea73ea
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/ChildAgentDataUpdate.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-10-31 00:13:33 +00:00
fd9cb3cb68
Store and send the current movement animation state to a new sim on crossing
2012-10-30 23:08:22 +00:00
48569e856a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-30 01:02:20 +00:00
c97890ca69
Add "force gc" region console command which manually invokes garbage collection.
...
For debugging purposes.
2012-10-29 22:53:06 +00:00
f3f794a122
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-26 21:47:41 +01:00
26cc57b6ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
b4923da334
Changed "course" to "coarse" in several places
2012-10-25 23:32:37 +01:00
21c476228a
Merge branch 'avination' into careminster
2012-09-10 13:53:00 +01:00
924df14c5e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
2012-09-07 19:49:46 +01:00
23be1cf1cd
remove fireandforget call to EnableChildAgents at end on CompleteMovement,
...
since this is already on own thread and its at the end of it.
2012-09-07 09:40:28 +01:00
9ae293881a
Make friend notifies and closing child agents async because both can
...
block the heartbeat thread if the sim being contacted is unresponsive
2012-09-04 22:53:52 +02:00
d4fad2ba42
a forgotten file plus minor changes. Imp and SL viewer seem to preserve
...
flight. FS 4.2.2 does not.
2012-09-04 07:32:03 +01:00
8d431c6359
formatting
2012-09-04 00:03:43 +01:00
663bfbb372
although the attachmentPoint argument is a uint, zero is not a valid attachment point
2012-09-04 00:03:43 +01:00
007a45aa76
Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster
2012-08-25 18:08:10 +01:00
ba58331b29
Extend "Restarting scripts in attachments" debug log message to show actual name of user and the region they are in
2012-08-24 22:56:05 +01:00
aee7a31bc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-18 13:17:39 +01:00
7243d4f842
BulletSim: Properly regenerate hulls when objects made physical.
...
This fixes the problem of non-base shapes (cubes and spheres)
falling through the terrain.
2012-08-17 14:45:18 -07:00
5c192b9bab
Modify order of code so SOP doesn't set the physics actor flying
...
property multiple times every time Update is called.
This eliminates zillions of settings which is better for BulletSim.
The should be no functionality change.
2012-08-17 13:34:20 -07:00
b95caaa453
on presence close(), release animator and OnRegionHeartbeatEnd event
2012-08-03 20:13:51 +01:00
70996603e5
Merge branch 'avination' into careminster
2012-08-01 00:07:57 +01:00
bd262fe3ed
Correct StandUp position and rotation
2012-07-30 03:05:57 +02:00
e012c81d7c
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-29 16:11:20 +01:00
729046e1ad
See that if controls are taken, those are released before taking new ones
2012-07-29 15:10:12 +02:00
7da744566d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-20 09:31:06 +01:00
e94831ddab
Stop explicitly closing and nulling out Animator in order to prevent NREs in various places due to race conditions.
...
Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking.
The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved.
2012-07-19 22:59:28 +01:00
0bc8238a6c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00
337ea019bd
If a part has a sit target and an avatar is already sitting, allow another avatar to sit in the position given if no sit target was set.
...
Previous behave was that the second avatar could not sit.
This matches behaviour observed on the LL grid.
2012-07-10 23:55:22 +01:00
cdea572d2e
refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() and SOP.RemoveSittingAvatar()
2012-07-10 23:50:04 +01:00
11e0ad6dc8
Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"
...
This reverts commit c8f0d476d2
2012-07-10 23:39:05 +01:00
c8f0d476d2
refactor: Add SOP.IsSitTargetOccupied to improve readability
2012-07-10 23:34:40 +01:00
69a6f6e3cd
refactor: use sit orientation argument passed in to SP.SendSitResponse() rather than creating a new copy
...
There are no issues with side-effects since this is a struct.
2012-07-10 23:26:40 +01:00
e8347b7095
Move common code to detect whether a part has a valid sit target into a SOP property rather than being repeated in SP.
...
This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical.
Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero.
2012-07-10 23:21:39 +01:00
506437b684
Remove log line accidentally left in SP.SendSitResponse()
2012-07-10 23:06:34 +01:00
d6f563794e
Don't allow a prim to be sat upon if its part of an attachment
2012-07-09 21:43:44 +01:00
2eaa6d5ace
Do not allow a script to attach a prim if its being sat upon.
...
This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar.
This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar.
Recording HashSet is null if there are no sitting avatars in order to save memory.
2012-07-09 21:24:32 +01:00
26d89777d8
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
41a1903c60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-06-28 03:21:08 +01:00
d043213317
refactor: Move ScenePresence <-> AgentData attachments copying code into AttachmentsModule.
2012-06-27 00:41:46 +01:00
7cc5b3d7d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-26 17:35:55 +01:00
e5b739aaeb
When attachments are being saved and deleted for a closing root agent, delete first to avoid a hud race condition with update threads.
...
If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
2012-06-25 22:48:13 +01:00
9ca9770cf6
fix a seg fault in sp.cs
2012-06-25 00:44:09 +01:00
8cf414ba32
*CHECK/REVIEW* comented out not used sp.ParentPosition. Comented out SOG.AbsolutePosition changing 'linked' avatars positions ( reason in code coment )
2012-06-17 11:38:40 +01:00
ff21007b93
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-15 15:48:34 +01:00
7bd274b3d3
Changed t adding the avatar dependent sit offset and not subtracting, so not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails()
2012-06-13 04:59:09 +01:00
b4ab9a7350
*TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams.
2012-06-13 01:26:15 +01:00
5fd6f678a4
Moved auxiliar funtions of last commit from sop to lsl api since they are only used on one place each
2012-06-12 02:20:47 +01:00
24e8e5d818
*UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar code in SOP.cs
2012-06-12 01:26:03 +01:00
bab7dab4c5
Comment out the scene presence sitting debug log messages for now
2012-06-11 23:37:16 +01:00
76a9885ad2
Merge branch 'master' into careminster
2012-06-11 23:15:38 +01:00
84377a23db
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
2012-06-11 16:56:40 +01:00
efff5a7c0d
Fix a corner case where checking for region corssing may cross an avatar back if
...
it's pending to be sat onto a vehicle that is in the process of crossing.
2012-06-08 18:25:36 +02:00
30f4a33f01
Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTeleport() if an agent needs closing.
...
This is always done as part of Scene.RemoveClient()
Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
2012-06-08 01:26:43 +01:00
8ebe2cd3da
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-08 01:12:37 +01:00
8e735efff0
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-02 02:01:48 +01:00
928e3e9e21
Fix LSL animation state reporting and animation state transitions on crossing
2012-06-01 23:04:28 +02:00
e696d1d952
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-31 03:37:43 +01:00
100d2968c4
Add advanced collision processing into ScenePresence
2012-05-29 17:24:17 +02:00
c46b31a9b4
Re-add script collisions that were lost in a merge
2012-05-29 16:58:08 +02:00
78e657fd8d
Merge branch 'avination' into careminster
2012-05-27 19:35:36 +01:00
2767574d0f
fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable value ( 1m);
2012-05-19 18:10:44 +01:00
10889c86d9
reduce useless waste of cpu. Make character collision events be done similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added)
2012-05-19 16:35:48 +01:00
ebd9d2618b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
2012-05-19 13:34:44 +01:00
98a2c7bfee
modulate collision sounds intensity with relative collision speed
2012-05-19 01:10:39 +01:00
895dadbdbd
Cleanup + change properties to set fields with private set : Thanks Justin for the tip.
2012-05-18 19:34:12 -04:00
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
521ad080f1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-17 23:56:36 +01:00
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
b4cd8b491b
Merge branch 'avination' into careminster
2012-05-17 13:34:47 +01:00
34f20b7fe3
Merge branch 'master' into careminster
2012-05-17 13:28:25 +01:00
295bb3227d
Force the default Telehub router if no matches are found in the config.
2012-05-17 00:47:19 -04:00
e4231e95a9
increase avatars collisions report to 10 per sec, Stopped sound on avatar to volumedetect collision
2012-05-17 04:41:46 +01:00
038986baff
add avatar colision sounds. Changed test sound UUID
2012-05-17 04:14:13 +01:00
6126b6da72
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-14 23:32:49 +01:00
7c229c8b81
Add configurable SpawnPointRouting
...
Will use one of three selected methods to route avatar landing
points when using Telehubs. The setting is in [Startup] using
SpawnPointRouting = closest/random/sequence
closest: The default setting. Routes avatar to the nearest SpawnPoint
to the location.
random: Picks random SpawnPoints to land the avatar.
sequence: Follows a sequence to place the avatar on the next available
SpawnPoint location
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-05-13 17:20:54 -04:00
fe029cf4e8
Merge branch 'avination' into careminster
2012-05-13 01:25:03 +01:00
7461fe4554
TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc
2012-05-12 15:27:37 +01:00
50321fb7bf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-09 00:43:33 +01:00
3bc5620d74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-08 16:06:02 -07:00
20952c75c5
Trigger event when scene presences are updated
2012-05-08 16:05:34 -07:00
c21c9e13ef
Mantis 1456 same region teleport of a sitting avatar.
...
Region to region was fixed some time ago in EntityTransferModule.
This applies the same fix for same region teleports.
2012-05-09 00:02:13 +01:00
b62cc3ce0a
Merge branch 'avination' into careminster
2012-05-05 10:32:22 +01:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
92fde6ed26
Mantis 60004 problems with damage and llSetDamage. In damage enabled areas this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
2012-05-04 21:01:09 +01:00
333d013b5c
Add the default animation to the child agent data update
2012-05-04 20:33:48 +02:00
b5b21013da
Reverse the order of physics event unsubscription to allow GC. Adapted from Unit's reverted patch
2012-05-04 20:06:42 +02:00
1183310a05
Retain velocity on walking crossing - adapted from Ubit's reverted patch
2012-05-04 20:05:51 +02:00
88c4c7283f
Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);"
...
This reverts commit 12c9916193
2012-05-04 20:02:14 +02:00
12c9916193
*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
2012-05-04 19:19:54 +01:00
fcd5b0817b
Reinsert a 2000ms delay before closing a no longer required agent on the source region after teleport to resolve Imprudence teleport problems.
...
Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region.
If Imprudence receives a DisableSimulator in this period, it quits.
We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly.
This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete.
2012-05-03 22:30:36 +01:00
2af7f50f26
Stabilize sit position on region crossing
2012-05-03 02:07:55 +02:00
9f9693dab8
Clear permissions given to the object we stand up from
2012-05-03 01:18:51 +02:00
bf630fb808
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2012-05-02 01:37:51 +01:00
9d2e1c67a8
Add regression test for teleporting between neighbouring regions on the same simulator
...
This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true.
Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
2012-05-01 23:14:12 +01:00
4b982db252
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.cs
2012-04-30 19:04:38 +01:00
d0598c63f3
refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 into SendControlsToScripts() (instead of SendControlToScripts()).
2012-04-30 17:33:08 +01:00
fe8e835bfc
Fixed: scripted controls didn't work if the avatar was sitting down
...
This fixes a bug introduced in 6473674bbf
2012-04-30 17:18:15 +01:00
174fa4a70f
Merge branch 'avination'
2012-04-29 01:33:40 +02:00
dcbcbd697f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2012-04-27 22:28:09 +01:00
6473674bbf
Fixed: custom walking animations didn't stop when the avatar stopped walking.
...
This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK.
This reverts commit feef1dd732
2012-04-27 20:47:02 +01:00
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
8ef7df5a56
test
2012-04-27 11:01:34 +01:00
2006188ee5
test
2012-04-27 10:49:32 +01:00
2419de2b6d
test
2012-04-27 10:10:31 +01:00
fedc9eb105
itest
2012-04-27 09:50:53 +01:00
cadbfcc011
itest
2012-04-27 09:15:31 +01:00
b948826b7e
test
2012-04-27 09:09:29 +01:00
03450dee39
testing....
2012-04-27 08:11:18 +01:00
76d9040ed4
testing
2012-04-27 02:54:39 +01:00
a64a9e48de
TESTING
2012-04-27 01:43:27 +01:00
30ab9647ba
TEST more changes
2012-04-27 01:24:44 +01:00
61e99fba87
TEST more options to avnLocalTeleport
2012-04-27 01:18:30 +01:00
2cf6023892
TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool Stopped) to scenepresence.cs
2012-04-27 01:06:07 +01:00
cb6791fb30
Tweak log messages on local region to region teleport path to help with problem resolution.
2012-04-26 22:35:25 +01:00
74dbfe6bb5
Comment out avatar move to target message for now.
2012-04-25 23:46:42 +01:00
db31c9fe58
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-25 19:15:40 +01:00
916e372382
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-04-25 16:49:07 +01:00
3be3189ee0
Commit the avination Teleport() methods (adaptedto justincc's changes)
2012-04-25 04:00:01 +01:00
9a23501824
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-04-25 02:33:39 +01:00
683cfc6f82
refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()
...
These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
2012-04-25 02:07:55 +01:00
a65ca24701
Add regression test TestSameRegionTeleport()
2012-04-25 01:51:40 +01:00
f0ba6c84e4
fix animations if sited in ground also
2012-04-24 07:27:14 +01:00
159b3b27ca
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-23 21:13:08 +01:00
26fd1e3a0c
fix a bug i added fixing another....
2012-04-22 03:08:47 +01:00
65b3e13010
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-20 00:17:14 +01:00
411bd0574d
Allow setting a specific target velocity on TeleportWithMomentum
2012-04-18 22:16:59 +02:00
74aa8eee12
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-17 01:54:54 +01:00
ab1a3688e2
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-17 01:50:49 +01:00
24a0cc5261
refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
...
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
2012-04-17 01:25:41 +01:00
3999822e13
Use chode character actor.SetMomentum() to force full restore Velocity in scenepresence TeleportWithMomentum(), since actor.Velocity was selected by original coders as the input of a desired velocity (even 'forces') that is modified by character conditions, like not changing velocity.Z if it is in free fall.
2012-04-14 05:07:52 +01:00
Melanie