2b2eb4dbe3
Merge branch 'dev_kitty' into dev
2011-02-14 11:36:57 -08:00
b31fa7d8fe
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-02-14 11:36:25 -08:00
411fa60b2b
RegionSyncModule.SendLinkObject and SendLinkObject now call BucketSyncInfoUpdate() for the linked/delinked
...
objects, to make sure they have updated timestamp information for synchronization purpose.
2011-02-14 11:33:57 -08:00
4d343d0fea
Move actor registration to actor modules. Add physics registation
2011-02-14 09:37:36 -08:00
63e35d53f7
Added implementation of GeneralBucketUpdateProcessor and PhysicsBucketUpdateProcessor
2011-02-11 16:51:38 -08:00
f47c301a56
Added SOP.HasPropertyUpdatedLocally() to help enqueue the right set of objects that have properties updated locally.
...
Also, in RegionSyncModule.SendSceneUpdates, added calling sog.UpdateTaintedBucketSyncInfo() to update timestamp of a tainted property bucket.
2011-02-11 16:23:03 -08:00
9970677ed8
Quark/Endpoint registration and lookup for three table database
2011-02-11 15:50:25 -08:00
7a331b6a8f
Switched to use ScheduleFullUpdates() and ScheduleTerseUpdates() as the funnel to catch any property updates, so as to update bucket's sync
...
timestamp correctly. Code good for compilation, runtime not tested yet.
2011-02-11 15:31:13 -08:00
5ef659520e
Access to sop.Shape.Scale replaced by sop.Scale.
2011-02-10 17:06:15 -08:00
88e42011af
In current SOP class, overrode functions in SOPBase that modified values of Shape or properties of Shape.
2011-02-10 15:32:59 -08:00
1da933041c
Started to added new access functions of SOP properties.
2011-02-10 11:37:34 -08:00
4fe0bd32d4
Actor/Quark registration for Simian backend
2011-02-09 17:17:50 -08:00
3cd1ec8752
Renamed SOP and SOPInventory as SOPBase and SOPInventoryBase, and define new SOP and SOPInventory. The latters
...
will invoke UpdateBucketSyncInfo the set functions of their properties, while the base classes won't.
2011-02-09 17:17:16 -08:00
a9ebb3ebae
Merge branch 'dev_kitty_debug' into dev_kitty
2011-02-08 15:55:45 -08:00
2dc857b31d
Added code to serialization/deserialize LocalFlags. Need further testing to see if it's necessary.
2011-02-08 15:55:00 -08:00
e8e9a0fb43
Enabled all synchronized properties to be updated by calling through SetXXX() to set values.
2011-02-08 15:33:54 -08:00
29053b19d8
Added set functions for the last a few properties. For some property assignments
...
in SOP, changed from "m_xxx=" to "Xxx=" to trigger UpdateBucketSyncInfo() as desired.
2011-02-08 10:08:09 -08:00
9ee4a7e9f3
Merge branch 'dev_kitty_debug' into dev_kitty
2011-02-07 17:20:50 -08:00
e9b831b8f4
1. Updated SOP.InventorySerial and SOP.TaskInventory set functions, to make sure only local write accesses trigger
...
UpdateBucketSyncInfo().
2. LinkObjectsBySync(), DelinkObjectsBySync(), and functions they call into, all updated to set properties via calling SetXXX instead of by "XXX=", so that the set operations won't trigger UpdateBucketSyncInfo().
2011-02-07 17:16:26 -08:00
6cb8b01bef
Added m_syncEnabled in SceneObjectPart to guard again modifying any syncinfo (timestamp, etc) while
...
deserializing and building SOP/SOG out of sync message.
2011-02-07 14:15:33 -08:00
396486a93b
Added set functions for the last a few properties in SOP.
2011-02-07 09:45:16 -08:00
c929348668
Majority of SOP properties have set functions added.
2011-02-04 17:05:08 -08:00
2ae8917c2e
Modified/added set functions for SOP properties: "AllowedDrop" to "Material", as listed in SceneObjectSerializer().
2011-02-04 15:01:38 -08:00
4fe0c6d0d2
Fixed a few bugs. Code now good for updating the physics properties implemented in SOG. Events
...
propagation also seems working fine (chat, link/delink objects, delete, etc).
2011-02-04 11:09:00 -08:00
f5870a1e23
slight optimization in the actor registration code
2011-02-04 09:25:54 -08:00
62a9e0b7c4
No longer calling SyncInfoUpdate to update timestamp. Bucket based concurrency control now in place for a few physics properties
...
whose SetXXX() functions have been implemented in SceneObjectPart.
2011-02-03 17:21:00 -08:00
3cff68340f
Implemented several SetXXXProperty functions. Set operation ("=") for these properties now first calls SetXXXProperty and then triggers UpdateBucketSyncInfo().
2011-02-03 14:24:15 -08:00
97b01dcf75
check in updates in enabling bucket based synchronization.
2011-02-03 12:01:08 -08:00
4a4ecb1cde
Initial stubs and code for quark/actor registration and lookup
2011-02-02 17:34:53 -08:00
c84551ae2c
Serialization/deserialization with BucketSyncInfoList works fine with a single object. Haven't tested with multi objects/linksets yet.
2011-02-02 16:44:05 -08:00
9ca061b25a
Starting add SetXXX() functions to SceneObjectPart, where XXX is each property's name. Also fixed some bugs in InitializeBucketSyncInfo
2011-02-02 15:46:12 -08:00
ce4c8e4b6f
Added code to include serialization/deserialization of BucketSyncInfoList in each SceneObjectPart.
2011-02-01 14:20:09 -08:00
f36f1010b7
Started to add code for concurrency control of updating objec properties on per bucket base. Added code to
...
process to PrimPropertyBucketMap in RegionSyncModule and BucketSyncInfo in SceneObjectPart.
2011-02-01 10:07:20 -08:00
a7d4c974dd
Added checks for null circuit data in AddNewClient2. In the case of RegionSyncAvatars being added to the scene, there will be no circuit data, no appearance data, and no teleport flags.
2011-01-31 14:32:34 -08:00
e709b55f01
Fixed compilation errors due to merge conflicts. AddNewAgent2 has been greatly reduced in complexity. We need to validate that it's going to do the right thing for the REGION SYNC cases.
2011-01-30 04:27:59 -08:00
a23ffa2262
Merge branch 'master' from git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-01-30 04:13:20 -08:00
ee10e23fc3
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-01-30 04:04:04 -08:00
8f008f394d
Flash out the prim count module
2011-01-29 04:27:20 +00:00
e7d5ff9bd2
Create the structure of classes and interfaces to replace the cruft that
...
is in the land management module today
2011-01-29 02:24:27 +00:00
0936455725
Adding the prim count module skeleton
2011-01-28 23:44:17 +00:00
38bfdb0c9d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 23:22:16 +00:00
5942385d0e
Add the prim count interfaces
2011-01-28 23:21:41 +00:00
933f47e89d
Comment out unused call to GridService in TeleportAgent()
2011-01-28 22:59:07 +00:00
a4acf485d7
minor: don't bother reparsing the sources for includes if ReadConfig() was unsuccessful
2011-01-28 22:50:49 +00:00
1fcb919798
If a non-globbed included file from config cannot be found then warn the user
2011-01-28 22:46:29 +00:00
810f4b9835
Add groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.ini
2011-01-28 22:07:35 +00:00
af29f4083f
move logging to central module. Fix orientation bug. Fix message echo bug.
2011-01-28 13:59:04 -08:00
ab1ec3c3cc
minor: remove a few mono compiler warnings
2011-01-28 21:51:25 +00:00
2ffa91d72a
Commented out some debug messages.
2011-01-28 13:39:05 -08:00
a0380af18f
Display supported file extensions/formats in "terrain load help" (Mantis #5349 )
2011-01-28 21:24:05 +00:00
Huaiyu (Kitty) Liu