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
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
1d2a25689a
RegionSyncServer and RegionSyncClient will not trigger RezAttachment anymore. Attachments
...
are synced via object sync protocol.
2011-02-18 16:08:12 -08:00
10a41ad5b5
Added code in SceneGraph.AddSceneObjectByStateSynch to handle attachment objects.
2011-02-18 15:49:01 -08:00
a25eac0a40
Remove old physics sync code. Attempt to fake ScenePresence in physics bucket sync
2011-02-18 08:11:29 -08:00
c9c94a5f23
Physics bucket packing and unpacking
2011-02-16 17:11:16 -08:00
3d1048f1e2
In SOG.UpdateGroupPosition, added AttachedPos as an updated property is the object is an attachment.
2011-02-16 16:57:47 -08:00
7b9bd89a5c
Made sure IsAttachment is set only after AttachedAvatar is set. Also, in GroupPosition get, added checking of "if m_parentGroup==null".
2011-02-16 15:42:10 -08:00
f99b516eec
Added serialization/deserilaization of Attachment related SOP properties to sync AttachObject.
2011-02-16 14:29:08 -08:00
21a1000da6
Physics bucket properties (a partial list implemented) seem be synchronized fine with simple tests (less than 10 prims, scripts running, link/delink).
2011-02-15 14:38:43 -08:00
94e433315e
Added code to send and receive SymmetricSyncMessage.MsgType.UpdatedBucketProperties sync message.
2011-02-15 14:02:53 -08:00
7229aa204e
In RegionSyncModule, now each property bucket has its own list of updated-prims.
...
An SOP will be inserted (now it's still its parent group will be inserted) into a bucket
if that bucket has been tained as updated.
Also, added Tainted property to BucketSyncInfo.
2011-02-14 17:08:49 -08:00
f05502f3fe
Merge branch 'dev' into dev_kitty
2011-02-14 14:56:48 -08:00
41c85d9fd1
Changed interface of ScheduleFullUpdate and ScheduleTerseUpdate, and pass a list of updatedProperties as the argument.
2011-02-14 13:54:34 -08:00
1837778cf9
Merge branch 'master' into dev
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2011-02-14 13:39:27 -08:00
4be96bc3d2
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-02-14 13:27:59 -08:00
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
c75e916ccf
Set filter to send proper rotations for root part
...
This allows the root prim, alone or in a set, to send it's
rotation. This fixes unsitting the avatar on sit-offsest
type teleports where the sit target is in the root prim of
a linkset.
2011-02-13 07:42:53 -08:00
19d3792278
Fix and simplify QBasedComparer.
...
Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order.
2011-02-13 11:11:49 +01:00
c169a62f55
Typo
2011-02-12 18:05:25 -08:00
059e9eaf98
Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis #5373 and #5384
2011-02-12 14:38:46 -08:00
a8ced66e87
Improved error message on TP failure
2011-02-12 07:28:21 -08:00
9801bf03f8
minor: add comment explaining that GetRegionsByName needs to stay in TeleportAgent for its side effects.
2011-02-12 01:14:12 +00:00
03d82a5a85
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
...
Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
2011-02-12 01:08:56 +00:00
63e35d53f7
Added implementation of GeneralBucketUpdateProcessor and PhysicsBucketUpdateProcessor
2011-02-11 16:51:38 -08:00
7e21c1eadf
Hack in a crude temporary "estate show" command
...
This will show the estate for each region, along with that estate's id and the estate owner.
This is temporary because the command output might change.
This commit also converts the estate module from the old to the new region module format
2011-02-12 00:46:01 +00: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
26727ee044
refactor: split out estate management commands into separate class
2011-02-11 23:32:38 +00: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
754c244f46
In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row from the data adaptor's Rows list in addition to calling Delete.
...
This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication).
Probably a holdover from copying code from the older legacy adaptor.
Resolves http://opensimulator.org/mantis/view.php?id=5361
2011-02-11 23:06:14 +00:00
98af0db8c0
minor: Add some more information to the mesh_sculpted_prim [PHYSICS] setting
2011-02-11 22:16:53 +00:00
8fd58aa00c
add estate name to show regions console command
2011-02-11 22:10:02 +00: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
45382e6f82
Reinstated a couple of null checks related to the previous revert.
2011-02-10 06:26:26 -08:00
89bb5c0941
Revert "Hunting down mantis #5365"
...
This reverts commit ebeef02fef
2011-02-10 06:09:04 -08:00
21715396fa
Put the Ack of UseCircuitCode back to where it used to be. Some ppl are reporting login issues.
2011-02-09 17:45:19 -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
f33e51e2ff
Comment instrumentation out. Not needed anymore. Left in comments, in case it is needed again. Mantis #5365
2011-02-09 09:50:26 -08:00
1cd951e5ae
Fix the negative number problem in TokenBucket. mantis #5365
2011-02-09 09:39:53 -08:00
830fee145d
Revert "Brute-force debug -- mantis #5365"
...
This reverts commit 585473aade
2011-02-09 08:35:36 -08:00
1bba9c6300
Revert "Don't build strings unless we're in emergency debugging."
...
This reverts commit ba202ea9b0
2011-02-09 08:35:21 -08:00
Robert Adams