e210d95821
Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly passed a null node reference.
...
Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752
2011-10-27 02:50:58 +01:00
2db6a8ce8f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-27 02:06:59 +01:00
820242bc49
Fix a bug I introduced yesterday in ODE physics where prim scripts would only receive the very first collision.
2011-10-27 02:05:59 +01:00
6a96c9546d
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
c763419043
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-10-26 17:55:53 +02:00
4a472b74c7
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-10-26 10:38:21 -04:00
41395d5443
Added optional owner classes to existing OSSL agent Permissions
...
PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 10:35:50 -04:00
ae8786ea6b
Merge branch 'master' of /home/opensim/src/OpenSim
2011-10-26 08:48:46 -04:00
9a28e7a4e0
Implementation of PRIM_OMEGA, but only for setting
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 08:41:07 -04:00
66bdd20628
Add some things to .gitignore to make the status cleaner
2011-10-26 08:33:17 -04:00
059f4b6a3a
Implementing PRIM_LINK_TARGET, but only for setting params
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 07:47:44 -04:00
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
c275c22928
Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c.
...
Also adds these to the watchdogs with very large timeouts (should really be infinite)
2011-10-25 23:26:21 +01:00
182908d216
In Watchdog, add ability to specific timeout for a thread.
...
This also changes the point of registration to the StartThread() call rather than the first Update()
2011-10-25 23:16:01 +01:00
e549f2f443
Add m_threads dictionary locking to Watchdog.GetThreads()
2011-10-25 22:51:23 +01:00
6a74a4c12b
Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from collision events
2011-10-25 22:46:42 +01:00
0f83f87233
Remove unused fields from CollisionEventUpdate
2011-10-25 22:39:08 +01:00
c825c9a945
Get rid of the pointless null checks on collision listeners. Add warning about synchronicity for PhysicsActor.OnCollisionUpdate event doc
2011-10-25 22:35:00 +01:00
b9f106f484
When sending object collision updates, don't null out and recreate the CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead.
2011-10-25 22:28:40 +01:00
5d37f0471e
For ScenePresence collision events, instead of creating a new CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead.
...
This assumes that the listener is using the data synchronously, which is currently the case.
2011-10-25 22:19:17 +01:00
7b6b36cee9
Fix bug where collision event listeners were not removed once the listener had gone away.
...
This was causing continuous use of temporary memory even when all avatars had left the scene.
Memory does leak but it does cause more calls to the garbage collector, which would pause the scene thread for a very short while during collection.
2011-10-25 21:40:51 +01:00
1fbb379536
minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it's an OdePrim
2011-10-25 21:15:37 +01:00
ee4c4e5058
Add new LindenCaps test dll to panda run as well as "nant test"
2011-10-25 21:03:41 +01:00
a4d4f54848
minor: add "threads show" as synonym for "show threads" for consistency
2011-10-25 20:59:27 +01:00
968cae6c17
Add "threads abort <thread-id>" simulator console command that allows us to abort a watchdog managed thread.
...
This is for diagnostic purposes.
2011-10-25 20:49:46 +01:00
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
27aca49a1f
Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge
2011-10-25 03:26:51 +01:00
c8dfef1583
Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge
2011-10-25 03:26:44 +01:00
a055dd39ac
Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge
2011-10-25 03:26:34 +01:00
8131ad0fb6
Merge commit '48295793b0d07579d9e31744ae6969df647f663c' into bigmerge
2011-10-25 03:26:27 +01:00
740077a291
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
2011-10-25 03:26:20 +01:00
4e9457ca0c
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
...
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
2011-10-25 03:26:09 +01:00
e94574196f
Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge
2011-10-25 03:19:55 +01:00
271c798813
Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge
2011-10-25 03:19:49 +01:00
84ea10a78c
Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge
2011-10-25 03:19:35 +01:00
508f2ebb76
Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmerge
2011-10-25 03:19:30 +01:00
98b7bd01cb
Merge commit '229ca09b7956f51fc2618dc35dff87cf04bf0fc9' into bigmerge
2011-10-25 03:19:16 +01:00
02f0aa592d
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
2011-10-25 03:19:10 +01:00
8639b037e1
Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge
2011-10-25 03:18:59 +01:00
de8cdbda15
Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge
2011-10-25 03:18:53 +01:00
be2cfeb5c3
Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge
2011-10-25 03:18:49 +01:00
da805d0cce
Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge
2011-10-25 03:18:38 +01:00
56f3da7b5a
Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge
2011-10-25 03:18:29 +01:00
1ae36695ba
Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge
2011-10-25 03:18:23 +01:00
0531b73695
Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge
2011-10-25 03:18:10 +01:00
564563d273
Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge
2011-10-25 03:18:04 +01:00
6d4480c1ca
Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge
2011-10-25 03:17:59 +01:00
3d0d84aff7
Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge
2011-10-25 03:17:45 +01:00
e35835602f
Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge
2011-10-25 03:17:40 +01:00
e058b0822f
Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge
2011-10-25 03:17:26 +01:00
Justin Clark-Casey (justincc)