e68d9a25b1
Merge branch 'dev' into physics
2011-01-03 15:25:31 -08:00
0b164072b3
Merge branch 'danmerge_symsync' into dev
2011-01-03 15:13:04 -08:00
ae8f8d60a6
remove some load balancing routine invocations to eliminate build breaks. Remove chatty grab debug messages
2011-01-03 12:21:38 -08:00
7bec1f71cf
Prevent position updates from being sent to remote simulation service.
2011-01-03 12:10:29 -08:00
5286198650
Add permissions hooks for object transfers
2011-01-03 19:42:58 +00:00
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
e1664b8d38
Fix child agent scoping
2011-01-03 19:42:26 +00:00
c48ddbfef1
Fix scoping for prim region crossings
2011-01-03 19:41:02 +00:00
9971766256
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2011-01-03 19:40:55 +00:00
be2af26231
Merge branch 'dev' into physics
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-01-03 10:47:19 -08:00
a34e152e9b
Additional debug text in ScenePresence.cs for appearance
2011-01-03 09:37:31 -08:00
8aded5bdd0
Debug message in ODEPrim on object creation. Less restrictive on changed test when routing updates in ODEScene
2011-01-03 09:13:44 -08:00
f0c2fe6569
Fixed build problem from merge. Needed to add 2 new functions to RegionSyncAvatar.cs as part of IClientAPI interface.
2011-01-02 18:56:59 -08:00
adeab48e7e
Merge branch 'master' into danmerge
2011-01-02 18:38:58 -08:00
9df74cf726
The "show" command on scene does not ever seem to be called anywhere. Commenting out the implementation for now and everything still builds. Might be a patch for master or needs a way to call it.
2011-01-02 18:28:42 -08:00
a5c321a548
Added region name to RegionSync debug messages for cases when there are multiple regions being synced by a single simulator.
2011-01-02 18:27:45 -08:00
df5e4a1e5b
Standardize the way WebRequests are made in the SimulationServiceConnector. Added
...
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
1f4d0ad460
Fix up a prior fix (refix the fixed fix :)
2010-12-30 02:31:05 +00:00
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
5acaba2974
Added basic implementation for ClientManagerSyncModule and PhysicsEngineSyncModule.
2010-12-29 17:01:45 -08:00
2ce7d982fa
Added functions to sync terrain updates. Either script engine or Scene can update terrain
...
and the other will be updated.
2010-12-29 13:41:51 -08:00
d42e0c39fc
Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified.
2010-12-29 07:36:39 -08:00
915c0b17b0
fixes a problem with ending slashes in GatekeeperService to verify session-addresses
2010-12-29 06:03:43 -08:00
994d70f9d8
Code good for script engine and Scene to sync on majority object operations:
...
e.g. script execution, editing objects, reloading
oar file on Scene (but terrian not updated correctly to the debugging viewer of script engine),
rezing objects by scripts, deleting objects.
2010-12-28 17:11:30 -08:00
821f80bf3f
Add funtions in RegionSyncModule and (Actor)SyncModules to correctly process SyncStop.
...
E.g. script engine will save script states and delete objects in local scene copy;
ScenePersistence still maintains object copies, though.
2010-12-28 15:58:16 -08:00
130915f669
Added functions to sync on RemoveObject event. Object can now be removed from either script-engine
...
or Scene and can be synced.
Problem: there is significant delay form when an object is removed on one actor, to the time it also
disappears from the viewer attaching to the other actor.
2010-12-28 14:54:40 -08:00
384895cbdd
Added synchronization functions to RegionSyncModule, Scene, SceneGraph, SceneObjectGroup and
...
SceneObjectPart: examples:
HandleAddOrUpdateObjectBySynchronization
QueueSceneObjectPartForUpdate
SceneObjectGroup.UpdateObjectAllProperties
SceneObjectPart.UpdateAllProperties
Now script engine and Scene can sync on script updating or Scene editing objects.
2010-12-28 12:09:17 -08:00
94ed69b1da
Update SimianGridServicesConnector to work more like
...
a connector so we can take advantage of the logic in
RemoteGridServicesConnector.
2010-12-27 17:18:49 -08:00
6386dfd362
No need for these methods to be virtual now.
2010-12-27 16:26:29 -08:00
f801d50a8a
WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
...
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
b16173e3e8
Drop the static from default wearables. It isn't
...
static.
2010-12-27 12:43:54 -08:00
f10059ccd9
1. Added ActorID to IDSGActorSyncModule and the modules that implements this interface.
...
2. Added LastUpdateTimeStamp and LastUpdateActorID to SceneObjectPart. Also added functions to
serialize and de-serialize the two new members.
2010-12-27 12:15:39 -08:00
06077f775f
Fixes mantis #5279
2010-12-25 08:28:42 -08:00
b23b29a53e
This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
2010-12-24 16:23:00 -08:00
3eaaaa0d99
One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
2010-12-24 08:50:00 -08:00
135b012bbd
Hopefully this fixes all prim inventory issues. No more abort, no more keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added.
...
This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
2010-12-23 19:31:37 -08:00
e68a8f7710
Added handlers to SceneGraph.OnObjectCreate event in both ScenePersistenceSyncModule
...
and ScriptEngineSyncModule, so that they can apply actor specific operations once
an object is added to the local Scene.
2010-12-23 15:42:05 -08:00
d0b429c186
Added SymmetricSyncMessage.cs to git index.
...
Added ScriptEngineSyncModule.cs with basic implementation. Code now good for script engine
to initilaize local scene by synch'ing with ScenePersistence's copy.
Fixed a bug in SyncStart(), so that it won't read in remote listeners' config info every time
SyncStart() is called.
2010-12-23 14:36:02 -08:00
d63e3db533
Added event OnPostSceneCreation to OpenSim/Region/Framework/Scenes/EventManager.cs, and TriggerOnPostSceneCreation. Reason: to emulate what PostInitialise() used to do for IRegionsModules, which is no longer included in INonSharedRegionModule.
...
Added OnPostSceneCreation() in RegionSynModule.cs, to gain ActorType information from the
loaded Scene.ActorSyncModule. OpenSim, when configured as ScenePersistence, can start normally now.
2010-12-23 14:07:05 -08:00
650b0bfe54
1. Restored SceneObjectSerializer.SOGToXml2() as in opensim trunk (master), so that objects
...
are serialized properly.
2. Added code to pass ActorType from a particular ActorSyncModule to RegionSyncModule.
2010-12-23 14:06:33 -08:00
0a9a8cc680
Restored SceneObjectSerializer.SOGToXml2() as in opensim trunk (master).
2010-12-23 10:29:12 -08:00
d829580e5e
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-12-23 13:17:55 -05:00
c108968020
* Cleanup from a commit a while ago.
2010-12-23 13:17:33 -05:00
bc67bc0d94
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-23 10:05:45 -08:00
54418c5e69
Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.
2010-12-23 10:05:08 -08:00
26e601a776
Put back a commented section of code. With some viewers, object inventory
...
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
862da9a55f
Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
2010-12-22 17:55:58 -08:00
dc6964444e
Two SyncConnectors now exchange RegionName and Terrian (Scene and Scriptengine tested).
2010-12-22 16:56:34 -08:00
bdeeead120
Add physics actor taint setting after receiveing update values
2010-12-22 15:35:26 -08:00
Robert Adams