fac89b6671
Merge branch 'master' into careminster
2012-03-23 02:46:49 +00:00
2190a62366
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 02:44:22 +00:00
ade164667f
Make anims way more snappy. Decouple SP animation handling from physics frame
...
time.
2012-03-23 03:16:07 +01:00
349454ca27
Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method doc. Rename HeartbeatThread, shuttingdown to conform to code standards.
2012-03-23 01:46:11 +00:00
c0672cb7db
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 21:27:03 -04:00
176bba4f67
Merge branch 'master' of /home/opensim/src/opensim
2012-03-22 21:26:30 -04:00
18b3f1132e
Rename Scene.StartTimer() to Start() - this method no longer uses a timer. Comment out more effectively unused old heartbeat code.
2012-03-23 01:21:43 +00:00
4ee8b3e23e
Fix build break
2012-03-23 01:11:43 +00:00
a9995ede65
Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e
...
Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.
2012-03-23 01:08:13 +00:00
bc2963d42a
Comment out unused scene loop restart code.
...
This has actually been unused since at least 0.7.2 due to earlier changes.
2012-03-23 01:03:10 +00:00
08b8ebcc7e
Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpdate is no longer properly updated and is redundant anyway.
2012-03-23 00:55:11 +00:00
c903813e00
RegionReady logging
...
Some maintenance to clean up logging messages
2012-03-22 20:49:45 -04:00
40b9b519b8
Add commented out section on collisions switch in Scene.SetSceneCoreDebug().
...
This was not implemented before the recent changes but should be at some point.
2012-03-23 00:12:14 +00:00
efe61b2481
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-22 17:04:06 -07:00
15c2499ccd
Comment out login parameters debug output accidentally included with c4b2d24
2012-03-22 23:31:41 +00:00
c1d064e1ca
Comment out a terrain save-tile debugging message that accidentally crept in with c4b2d24
2012-03-22 23:16:52 +00:00
dfd7068864
Merge branch 'master' into careminster
2012-03-22 23:06:25 +00:00
ed67b698d3
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-03-22 23:05:58 +00:00
9edf99703a
Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster
2012-03-22 23:01:50 +00:00
5bf45b9b98
refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in MoveTaskInventoryItem()
2012-03-22 22:40:38 +00:00
760010d6fb
Fix llGiveInventory() so that it checks the destination part for AllowInventoryDrop, not the source.
...
This allows llAllowInventoryDrop() to work.
Regression test added for this case.
2012-03-22 22:33:37 +00:00
3bcf71c647
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 22:33:16 +00:00
c4b2d24f33
Add llGiveInventory() test from object to object where both objects are owned by the same user.
2012-03-22 22:17:07 +00:00
df624c13c9
HG Friends: don't notify if the server isn't there.
2012-03-22 15:08:57 -07:00
25e5b6a76c
Added new simple_build_permissions config to the .ini and .example files.
2012-03-22 14:21:07 -07:00
53b4551b58
Fix merge issue from core
2012-03-22 20:48:31 +00:00
76a54f4680
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
2012-03-22 20:42:06 +00:00
6bc1ccf234
Change a false false to be truly true - or is this statement false?
...
Fixes perms boo-boo
2012-03-22 20:39:18 +00:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
b5d0bc2488
Rework Diva's patch to simplify it
2012-03-22 20:25:20 +00:00
45b588cf00
Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."
...
This reverts commit 6146e7ef25
2012-03-22 20:10:38 +00:00
6146e7ef25
Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
2012-03-22 12:57:12 -07:00
a8c87bab64
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 01:56:07 +00:00
c98e3a6422
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-21 20:34:51 -04:00
06c81a2afe
Fix typo
...
Add enclosing " to urls
2012-03-21 20:33:45 -04:00
4bfd9e28ca
BulletSim: add updated (but not working) BulletSim dlls
2012-03-21 17:24:17 -07:00
b383690b96
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
OpenSim/Framework/PriorityQueue.cs
2012-03-22 00:19:28 +00:00
9949ac2f9f
refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity since non-default animations are handled completely separately from this class
2012-03-22 00:10:41 +00:00
71ec84d77f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 00:00:05 +00:00
1a8769e6ef
Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead.
...
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
2012-03-21 23:57:39 +00:00
7783c93802
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-21 16:16:47 -07:00
cb2727cf6e
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-21 16:16:46 -07:00
6c55fd93a3
BulletSim: set buoyancy in only one place
2012-03-21 16:16:45 -07:00
898a16802b
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-21 16:16:44 -07:00
3e7e166124
BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to the new lib32 and lib64 binary directories
2012-03-21 16:16:42 -07:00
eafc3d6c47
BulletSim: Update list of TODO tasks
2012-03-21 16:16:41 -07:00
dc90c53596
reverted priorityQueue changes
2012-03-21 23:15:32 +00:00
8652f277df
Revert "Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out."
...
This reverts commit 68981d01f0
2012-03-21 22:45:34 +01:00
68981d01f0
Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out.
2012-03-21 21:19:29 +00:00
4f593fa8c3
minor clean
2012-03-21 21:17:00 +00:00
Melanie