facdc9c46e
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 22:56:08 +00:00
bbbcdaa462
Remove spammy autopilot debug
2011-11-05 22:54:47 +00:00
9bded61ca4
Whitespace fix from core
2011-11-05 22:48:32 +00:00
01b6a4b62e
Remove some left over debug and reverse experimental reordering of ifs
2011-11-05 22:46:45 +00:00
4d3926694d
Remove enableprejump config option and associated code as this is now
...
fully functional and cannot be disabled because that would break timings.
2011-11-05 22:43:45 +00:00
71388fc02a
Porting the ScenePresenceAnimator from Avination. Jump and fall anims now work
...
properly.
2011-11-05 22:41:00 +00:00
5517e21068
Harmonize with core and remove extraneous comments with no information in them
2011-11-05 22:34:36 +00:00
534560df8c
Remove backup optimization that was causing prim contents to poof
2011-11-05 23:31:20 +01:00
8fb6ae379a
Change m_falling public to a getter property.
2011-11-05 22:05:27 +00:00
9c6025f928
Adapt to the core SP rework
2011-11-05 21:53:05 +00:00
ac3254a5f5
Change puvlic m_ variable to a getter property
2011-11-05 21:43:35 +00:00
2dc452b4a7
ScenePresence part of the Avination animator fixes.
2011-11-05 21:41:16 +00:00
b6df9e9fe4
Chnaging the sit target adjustment to a more precise approximation of SL. Some small
...
fixes ported from Avination. Some white space fixes.
2011-11-05 21:24:36 +00:00
0f279b1187
Some more changes to catch up with core
2011-11-05 21:23:25 +00:00
cc8e693fb9
Remove unused and broken OffsetRotation from ScenePresence
2011-11-05 20:39:43 +00:00
506653ff00
Some trivial changes to get closer to core
2011-11-05 20:32:20 +00:00
1a6b2a6429
Change comment formatting to match core for a cleaner diff
2011-11-05 20:17:02 +00:00
bda7b3dffe
Replace our patched up, broken an rebroken sit code with the code from
...
core which has now matured beyond what we had.
2011-11-05 19:28:16 +01:00
03f5bbcaf2
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 11:17:40 +00:00
2cf6172689
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 11:05:32 +00:00
e8a8e462ed
add myself to the contributors.txt
2011-11-05 03:03:57 -07:00
e182cc198d
Fix avatar height, removes the hip offset hack
...
Author: Mana Janus <mana@mjm-labs.com>
2011-11-05 02:56:52 -07:00
4797ed6edd
Multiple lines in welcome message use '\n' in the welcome message to
...
start a new line.
2011-11-05 02:42:21 -07:00
f0d2fcfbe9
add Mana Janus and SpotOn3D to contributors.txt last patch was courtesy
...
of Mana Janus I failed to mention that, sorry!
2011-11-05 02:35:19 -07:00
e3885625a0
Don't rotate child prims, if only the root prim is rotated.
2011-11-05 02:26:25 -07:00
cfce2529ad
refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity instead of individual components of a vector/quat
2011-11-05 02:04:48 +00:00
8105794121
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-05 01:42:20 +00:00
28c4dc9be4
Fix NPC sitting for prims without a sit target.
...
This is to partially address http://opensimulator.org/mantis/view.php?id=5769
We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger.
By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>.
However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent).
Hopefully this can be addressed soon.
2011-11-05 01:38:42 +00:00
b199aad037
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-05 00:11:10 +00:00
c3a23ffcdc
Merge branch 'master' into bigmerge
2011-11-05 00:10:53 +00:00
c803ed28c3
Replacing te linking code with the code from Avination. Link sets prims are now
...
numbered properly even when sets are linked to sets.
2011-11-05 00:09:37 +00:00
f7b8c54c24
Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPrim.changevelocity()
2011-11-04 23:43:17 +00:00
d7815ace4a
On standup, trigger the changed link script event after the avatar has been fully changed.
...
This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work.
Probably the event is fired before the physics actor has been set up again for the stood avatar.
Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
2011-11-04 23:24:22 +00:00
b9f7aebde3
Merge branch 'master' into bigmerge
2011-11-04 23:21:19 +00:00
ccca6ba935
Stop llPushObject() from causing problems by adding force via a taint rather than directly.
...
This isn't a perfect solution since there can be a race between the taint processing and taint setting, as force needs to be reset after processing.
Needs careful locking in the future.
2011-11-04 23:12:01 +00:00
24235006f4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
b8d50b10fb
Rename ForEachAvatar back to ForEachScenePresence. The other changes
...
from previous commit which sort out which iterator is used are left
intact. A discussion is needed as to what constitutes an avatar vs a
ScenePresence.
2011-11-03 17:53:51 -07:00
94dc7d07eb
Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to
...
the 3 iteration functions so more of them are using the correct
iteration for the action they are performing. The 3 iterators that seem
to fit all actions within OpenSim at this time are:
ForEachAvatar: Perform an action on all avatars (root presences)
ForEachClient: Perform an action on all clients (root or child clients)
ForEachRootClient: Perform an action on all clients that have an avatar
There are still a dozen places or so calling the old
ForEachScenePresence that will take a little more refactoring to
eliminate.
2011-11-03 17:06:08 -07:00
69a4057135
remove the pointless check of the face texture struct against null in Bot.Objects_NewPrim()
2011-11-03 22:52:14 +00:00
e4bdf1e78f
actually remove the sleep from PhysicsBehaviour that I shifted to Bot a couple of commits ago
2011-11-03 22:50:40 +00:00
f26fdbd8da
Rename PhysicsBot => Bot since it doesn't just exercise physics anymore
2011-11-03 22:39:06 +00:00
ca2c25ece2
Move one of the old physics sleeps out into the main bot loop, so leaving out PhysicsBehaviour doesn't result in continuous other behaviours
2011-11-03 22:35:21 +00:00
5a67940acc
Add click/grab behaviour to pCampbot, which gets bots to randomly click things.
...
This can be specified on pCampbot.exe by using g in the list of behaviours for the new -behaviours,-b switch
e.g. -b p,g to get both existing physics and grabbing behaviours.
grabbing is primitive, it attempts grabs on random prims whether they're actually signalled as clickable or not.
behaviour is currently primitive overall, behaviours are just executed in a list
2011-11-03 22:31:31 +00:00
3ea379e4cd
Move PhysicsBehaviour into a spearate behaviours folder
2011-11-03 21:25:27 +00:00
66c60c56a0
Separate out physics testing actions into a separate PhysicsBehaviour class
2011-11-03 21:16:24 +00:00
a62ccb5c4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-03 20:12:10 +00:00
40a1eddfd1
Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size
...
not a target size. Mono 2.10 appears to try to allocate the full buffer which
immediately crashes. Tested on mono 2.6.7 and 2.10.5
2011-11-02 18:55:54 -07:00
457195466d
Merge branch 'master' into bigmerge
2011-11-03 00:23:58 +00:00
6b4ae4f30c
Revert "fix CopyTo call that was breaking under mono 2.10"
...
This reverts commit d30971fdc2
2011-11-03 00:23:32 +00:00
99a347ee11
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-02 17:11:10 -07:00
Melanie