e21176f974
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-07 15:58:36 -08:00
7210b7f517
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-03-07 15:57:31 -08:00
3fe31ad457
Added back the LocalFlags as one of the SOP properties to be synced, so that script events such as touch is propogated properly.
...
Also removed some debug messages.
2011-03-07 15:51:59 -08:00
59fbb9cbef
Restore physics bucket serialization that was lost in previous commit
2011-03-03 11:37:24 -08:00
b76c233db3
Merge branch 'dev_kitty' into physbucket
...
Conflicts:
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
2011-03-03 08:54:01 -08:00
91e8fc50d3
Change Constants.RegionSize back to 256.
2011-03-01 14:50:33 -08:00
6b9d58b99b
Make PECharacter sync PhysActor info back to physics actor. Remove some chatty debug messages. Add checks to warn if PhysicsActor synchronization is acting on a prim rather than a character.
2011-03-01 12:42:05 -08:00
b82b0b1677
Normalizing comparison to lower case, just in case ppl set their config vars inconsistently. (maybe related to mantis #5386 )
2011-03-01 09:20:50 -08:00
400c9b5293
Using PhysActor sync for avatars and bucket sync for prims. Working with avatars kicking physical objects
2011-02-28 14:09:19 -08:00
cea47491de
Fix a few little things
2011-02-27 19:49:23 +00:00
11db34313d
Restore old PhysicsActor sync code. Not tested yet
2011-02-25 16:54:04 -08:00
319c48f112
Restore old PhysActor synchronization routines
2011-02-25 16:30:52 -08:00
a5c55a19ef
Merge branch 'dev' into dev_kitty
2011-02-25 16:23:57 -08:00
f7de4f37ce
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-02-25 16:22:51 -08:00
9d613a20c0
Relocate functions within RegionSyncModule.cs: the IRegionSyncModule region now
...
only contains functions defined in IRegionSyncModule.
2011-02-25 16:20:58 -08:00
153fd02f0f
Add SimianGridServiceConnector::LookupEndpoint to get info on a particular sync server endpoint
2011-02-25 16:03:35 -08:00
784cb6c95c
Changed some less important messages from Warn to Debug
2011-02-25 15:21:07 -08:00
2b04cab1ee
change some log messages from info to debug
2011-02-25 02:15:06 +00:00
0f545abfc1
Make the file expiration defaults the same whether the whole [FLOTSAM ASSET CACHE] section is missing or just the particular config values
2011-02-25 01:31:38 +00:00
939c47ac52
instead of using different default memory expiration depending on whether there is a [FLOTSAM ASSET CACHE] section present at all, use the same default all the time
...
this simplifies the code
2011-02-25 01:25:38 +00:00
beff0ac32f
log actual cache directory for FlotsamAssetCache instead of always logging the default
2011-02-25 01:18:43 +00:00
197cc3883f
Fix bug where having no maximum memory cache timeout would cause the flotsam asset cache to try using Double.MaxValue, which would cause the underlying OpenMetaverse.ExpiringCache to choke.
...
There is probably an underlying bug to fix in ExpiringCache.
2011-02-25 01:16:47 +00:00
f212a60067
Merge branch 'dev_kitty' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into physbucket
...
Conflicts:
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-02-24 14:48:11 -08:00
2335968271
Adding SOG/SOP to ScenePresence working more but confusion on UUID of presence vs SOG
2011-02-24 14:41:16 -08:00
2f5394e70d
Fix bug where avatars in other regions would not always show up on the mini-map
2011-02-24 22:33:54 +00:00
db7c758b7f
On a Grid Handler exception, explicitly log the exception message and stack trace so that we get somewhat better diagnostics on windows
2011-02-24 00:55:50 +00:00
1bb0bae78a
Forces the owner of a rezzed object to be the "rezzer" of the
...
object rather than the owner of the inventory item. In theory,
this shouldn't happen unless you are using grid-wide library
for inventory.
2011-02-22 13:30:38 -08:00
5a16fa882c
Parameterizes the view distance used to compute and manage
...
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.
This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.
WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
2011-02-22 13:23:54 -08:00
af22b7cb1a
GetRegion(s)ByName with SQLite behaves like it does with other databases.
...
The in-memory storage of region data that is used by default with SQLite now handles wildcards in region names in the same way as SQL queries do with other databases.
2011-02-22 13:00:45 +01:00
1ff16c93a3
Another attempt to add SOG/SOP to ScenePresence so it can be handled by bucket update code
2011-02-18 17:16:57 -08:00
513ca97eb0
Added code to propogate event OnAttach.
2011-02-18 17:05:25 -08:00
9e47018cfb
Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway
...
This test was non-viable. Keeping inactive T021_TestCrossToNewRegion() around for now since it's still useful for reference purposes in constructing a future working test.
2011-02-19 00:14:13 +00:00
b3a1d8c7f7
Remove unused SceneSetupHelpers.DeleteObjectAsync().
...
Calling async code in automated tests is never a good idea - things become very fragile very quickly
2011-02-19 00:11:08 +00:00
1d2a25689a
RegionSyncServer and RegionSyncClient will not trigger RezAttachment anymore. Attachments
...
are synced via object sync protocol.
2011-02-18 16:08:12 -08:00
9d668b09ca
remove unused code to share services between scenes in SceneSetupHelpers - this is done differently elsewhere
2011-02-19 00:07:16 +00:00
60fe3d48ee
Put some CapabilitiesModule null checks in Scene
...
Stop tests setting up a capabilities module by default
2011-02-18 23:50:54 +00:00
10a41ad5b5
Added code in SceneGraph.AddSceneObjectByStateSynch to handle attachment objects.
2011-02-18 15:49:01 -08:00
8249d77991
If GridService.GetNeighbours() could not find the region then log a warning rather than causing a null reference on the normal log line
...
This also extends the TestChildAgentEstablished() test to actually activate the EntityTransferModule, though the test is not yet viable
2011-02-18 23:25:59 +00:00
5c92f62941
minor: remove mono compiler warning
2011-02-18 23:10:46 +00:00
dd9efc1838
extend TestChildAgentEstablished() test slightly to put in EntityTransferModule. Not yet enabled.
2011-02-18 23:05:56 +00:00
eb699df5f6
On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for the last stage of AddRootAgent() instead of SP.MakeRootAgent()
...
Going this extra step doesn't appear to cause any test failures.
This is arguably better for test purposes, though at some stage another method may arise which does just call AddRootAgent().
2011-02-18 22:49:19 +00:00
023f953f39
remove another unused test teardown method
2011-02-18 22:25:45 +00:00
c155f57dbe
remove unused test teardown method
2011-02-18 22:22:51 +00:00
c763edf56d
separate attachment tests out into their own class
2011-02-18 22:20:08 +00:00
60d47836ce
minor: remove mono compiler warning
2011-02-18 22:00:52 +00:00
88da253c94
Add very basic test which invokes the scene update loop once and checks the frame number.
...
This makes Scene.Update() match its original description of performing a single update, which also matches the semantics of SOG and ScenePresence.
2011-02-18 21:54:44 +00:00
e774679f62
minor: add method doc to a few ScenePresence methods
2011-02-18 21:19:16 +00:00
4725221435
Stop the avatar sometimes pausing for more than a second on the border when region crossing.
...
This restores a RemoveFromPhysicalScene() call in ScenePresence.CheckForBorderCrossing() when the agent has been placed in transit.
If we don't remove the agent from the physical scene, then the method continues to be called via ScenePresence.Update()
until the handover of the client between regions is completed. Since this handover can take more than 1000ms (due to the 1000ms
event queue polling response from the server), this results in the avatar pausing on the border for the entire handover period.
2011-02-18 20:54:00 +00:00
a25eac0a40
Remove old physics sync code. Attempt to fake ScenePresence in physics bucket sync
2011-02-18 08:11:29 -08:00
4f9c3c73ad
Add support for new naming syntax of linked regions to osTeleportAgent and osTeleportOwner.
2011-02-17 13:47:13 +01:00
Dan Lake