Commit Graph

14211 Commits (2ae8917c2e10f131021899833956514c4a413e19)

Author SHA1 Message Date
Huaiyu (Kitty) Liu 2ae8917c2e Modified/added set functions for SOP properties: "AllowedDrop" to "Material", as listed in SceneObjectSerializer(). 2011-02-04 15:01:38 -08:00
Huaiyu (Kitty) Liu 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
Huaiyu (Kitty) Liu 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
Huaiyu (Kitty) Liu 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
Huaiyu (Kitty) Liu 97b01dcf75 check in updates in enabling bucket based synchronization. 2011-02-03 12:01:08 -08:00
Huaiyu (Kitty) Liu 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
Huaiyu (Kitty) Liu 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
Huaiyu (Kitty) Liu ce4c8e4b6f Added code to include serialization/deserialization of BucketSyncInfoList in each SceneObjectPart. 2011-02-01 14:20:09 -08:00
Huaiyu (Kitty) Liu 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
Dan Lake 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
Dan Lake 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
Dan Lake 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
Dan Lake ee10e23fc3 Merge branch 'master' of git://opensimulator.org/git/opensim 2011-01-30 04:04:04 -08:00
Melanie 8f008f394d Flash out the prim count module 2011-01-29 04:27:20 +00:00
Melanie 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
Melanie 0936455725 Adding the prim count module skeleton 2011-01-28 23:44:17 +00:00
Melanie 38bfdb0c9d Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-01-28 23:22:16 +00:00
Melanie 5942385d0e Add the prim count interfaces 2011-01-28 23:21:41 +00:00
Justin Clark-Casey (justincc) 933f47e89d Comment out unused call to GridService in TeleportAgent() 2011-01-28 22:59:07 +00:00
Justin Clark-Casey (justincc) a4acf485d7 minor: don't bother reparsing the sources for includes if ReadConfig() was unsuccessful 2011-01-28 22:50:49 +00:00
Justin Clark-Casey (justincc) 1fcb919798 If a non-globbed included file from config cannot be found then warn the user 2011-01-28 22:46:29 +00:00
Justin Clark-Casey (justincc) 810f4b9835 Add groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.ini 2011-01-28 22:07:35 +00:00
Robert Adams af29f4083f move logging to central module. Fix orientation bug. Fix message echo bug. 2011-01-28 13:59:04 -08:00
Justin Clark-Casey (justincc) ab1ec3c3cc minor: remove a few mono compiler warnings 2011-01-28 21:51:25 +00:00
Huaiyu (Kitty) Liu 2ffa91d72a Commented out some debug messages. 2011-01-28 13:39:05 -08:00
Kevin Cozens a0380af18f Display supported file extensions/formats in "terrain load help" (Mantis #5349) 2011-01-28 21:24:05 +00:00
Kevin Cozens 9798b044fe Added loading and saving of terrain files using Terragen format (Mantis #1564)
Terrain files can now be loaded and saved using the Terragen (.ter) format.
Selection of the terrain file loader to use is now based on the extension
of the filename being loaded and the data is loaded using a memory stream
instead of writing it to a file and then loading it from the file.
2011-01-28 21:19:53 +00:00
Huaiyu (Kitty) Liu 1252df6f1e Added code to receive and process DelinkObject sync message. Preliminary delink tests seems running fine. 2011-01-28 12:11:42 -08:00
Melanie ab48caad08 Make the new style stuff compatible with the older revision 2011-01-28 05:25:53 +00:00
Melanie 188d86998d Fix up QueryAccess to also check parcels 2011-01-28 04:09:04 +00:00
Melanie d90b0c53ec Fix bumping into sim borders and check estate bans for walking crossings 2011-01-28 02:38:14 +00:00
Melanie 80bf95b7b4 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-01-28 02:34:45 +00:00
Melanie 5a0cb7d37e Thank you, Goetz, for a patch to fix prim count display in cut regions. 2011-01-28 02:34:07 +00:00
Huaiyu (Kitty) Liu 1b99c33e6c Added code to send out DelinkObject message at the actor that initiates the operation. 2011-01-27 16:19:36 -08:00
Justin Clark-Casey (justincc) f9ea5e69c5 Refactor: Break out LoadObjects() and LoadParcels() from a longer method 2011-01-27 21:07:21 +00:00
Justin Clark-Casey (justincc) 19e4473a97 Put confirmation on "land clear" command to avoid nasty accidents 2011-01-27 20:57:59 +00:00
Justin Clark-Casey (justincc) be3685b1a2 When an oar is loaded, do not create a default parcel before loading the parcels from the OAR.
The region spanning parcel shouldn't exist in this situation.  If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.

Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
2011-01-27 20:36:50 +00:00
Justin Clark-Casey (justincc) 42c0dbf49a Show local IDs in "land show" output.
Also properly insert region name in "land clear" command
2011-01-27 20:11:30 +00:00
Justin Clark-Casey (justincc) ab9a0f2f1d Add "land clear" command
This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
2011-01-27 19:37:20 +00:00
Robert Adams 270f7e653a Add rotationalVelocity and acceleration to variables that are synced in PhysicsActor. Remove unused Prop class. 2011-01-27 11:05:26 -08:00
Robert Adams 8d87d9e42d Add locking to prim and avatar lists to fix enumeration errors 2011-01-27 11:03:23 -08:00
Robert Adams cfab010b10 Add IClientCore to RegionSyncAvatar to fix cast error on teleport 2011-01-27 11:01:48 -08:00
Justin Clark-Casey (justincc) 5a26dc2743 Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
The --merge switch will still merge the old and new land parcelling.
2011-01-27 18:48:48 +00:00
Justin Clark-Casey (justincc) e33cb3db93 remove unused CreateBaseLand() 2011-01-27 16:50:41 +00:00
Melanie b0f641fa15 Make it work 2011-01-27 06:41:07 +00:00
Melanie 17801bd78b Add a TeleportFlags member to SP so we can tell how we got there. 2011-01-27 05:33:46 +00:00
Melanie adb341e32f Also set Godlike flag. Might be useful 2011-01-27 05:33:01 +00:00
Melanie 61b67b2ead Add TeleportFlags.ViaRegionID to the flags sent on login when the region
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 05:32:54 +00:00
Huaiyu (Kitty) Liu 85b7bb916f Added some if condition in RegionSyncModule.SendSceneUpdates, so that if no updates to send, no thread is assigned to send updates. 2011-01-26 17:17:03 -08:00
Huaiyu (Kitty) Liu 441551e7c6 Commented out debug messages in enabling LinkObject synchronization. 2011-01-26 16:39:18 -08:00