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
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
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
e14cb45b9b
Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()
...
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
2011-10-24 23:26:41 +01:00
9ec672c70b
Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
...
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-24 23:16:03 +01:00
79d5bc9beb
separate out future common setup code from EventQueueTests.AddForClient()
2011-10-24 22:29:13 +01:00
48295793b0
re-enable running linden udp tests in local.include, though no tests are currently active there
2011-10-24 22:25:38 +01:00
e28e2d24c7
Add new EventQueueTests with basic test to check that adding a client registers an http poll
2011-10-24 22:23:41 +01:00
4c9400e646
Add optional getauthinfo and setauthinfo authentication service calls.
...
These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default)
These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
2011-10-24 21:40:36 +01:00
b868328d51
Comment out the uuid gatherer lines that I accidentally left in.
2011-10-23 03:14:32 +01:00
c2272a755f
Fix missing Busy-Mode Response
...
http://opensimulator.org/mantis/view.php?id=5748
2011-10-22 13:17:07 -04:00
3fc47275cf
Add case to Lightshare/Windlight
...
Thanks thomax for a patch to add handling for Sun/Moon pos.
2011-10-22 13:06:34 -04:00
655aee44c4
Rename some of the example commented out server names to mygridserver.com like all the others.
...
This is to make it easier to change all these names at once, where all grids services are running from the same location.
Also rearranges some lines in [Modules] so that StandaloneCommon.ini.example and GridCommon.ini.exmaple are consistent.
2011-10-22 02:51:41 +01:00
229ca09b79
Make config comments about choosing assetcache modules clearer.
...
OpenSim needs an asset cache. Running without one will cause problems.
Thanks to Ai Austin for the suggestions in http://opensimulator.org/mantis/view.php?id=4850
2011-10-22 02:47:53 +01:00
ffdf59a57c
Get UUIDGatherer to scan notecards in the graph for asset uuids.
...
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
2011-10-22 02:16:46 +01:00
30320505fa
redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we can comment out some inconsistency
2011-10-22 00:58:56 +01:00
bc2da4eaad
correct misleading method doc on CreateNotecardAsset()
2011-10-22 00:55:50 +01:00
c4f8da7359
in AssetHelpers, store the actual text passed in to the method, not the string "data"
2011-10-22 00:45:47 +01:00
5d7eaedbeb
encode notecard assets in proper format for tests, rather than just using whatever string is given
2011-10-22 00:21:45 +01:00
9b3bbedeea
refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset()
2011-10-22 00:13:46 +01:00
a1f05a289d
RemoteAdmin - Added optional terrain loading on region create using parameter heightmap_file to specify the terrain file to be loaded
2011-10-21 23:12:01 +01:00
4241ee5dfa
very minor removal of old commented out line of code in OdeScene
2011-10-21 00:04:36 +01:00
30fe66d3ab
remove unnecessary null check on _collisionEventPrim
2011-10-20 20:58:29 +01:00
9c43020876
Get OdeScene to use passed in time step rather than hard-coded 0.089
...
However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
2011-10-20 20:48:51 +01:00
6837e44d07
Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime)
...
SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame.
This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog.
This doesn't appear to play much practical role right now.
ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value.
2011-10-20 19:44:59 +01:00
b63ec987b0
For now, stop passing timeStep into methods where it's not actually used.
2011-10-20 17:54:32 +01:00
f16d125027
Change wording on asset requests.
...
Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text.
2011-10-19 23:56:17 +01:00
9ab2943abf
Removed redundant NotInTransit function from ScenePresence. IsInTransit=false does the same thing and NotInTransit was not used anywhere.
2011-10-19 15:50:09 -07:00
eac29396d9
Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line endings from previous commit.
2011-10-19 15:38:25 -07:00
8b20faf06c
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-19 14:43:16 -07:00
da794f34a5
Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of scene presence by client ID.
2011-10-19 14:41:44 -07:00
Justin Clark-Casey (justincc)