Justin Clark-Casey (justincc)
2fa8fc5052
remove inventory service preserving code from SceneSetupHelpers too
2011-03-09 01:37:31 +00:00
Justin Clark-Casey (justincc)
f375a5e9cb
Simplify SceneSetupHelpers class by removing all code which was originally preserving service instances between tests. This wasn't being used anyway and just leads to hard to diagnose test failures.
2011-03-09 01:31:47 +00:00
Justin Clark-Casey (justincc)
8a2360bf81
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
2011-03-09 01:21:31 +00:00
Justin Clark-Casey (justincc)
743a6b0da5
Make -m shortcut option for --merge on load iar specific. Correct some log message origins.
2011-03-08 22:44:02 +00:00
Robert Adams
d514c31cc2
Merge branch 'dev' into syncstats
2011-03-08 14:23:41 -08:00
Robert Adams
e0f28ac5ba
Basic SyncConnector status for ssync status
2011-03-08 12:59:46 -08:00
Huaiyu (Kitty) Liu
ae258a21e4
Added code to propogate event OnChatBroadcast (llOwnerSay is handled by this), and consolidate code
...
with events OnChatFromClient and OnChatFromWorld.
2011-03-08 11:00:52 -08:00
Diva Canto
9923a2ff10
Pull up Assembly of the MySQL classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is just a refactor -- no functional changes whatsoever.
2011-03-08 09:02:29 -08:00
Huaiyu (Kitty) Liu
052af34a52
Added Shape as one of the properties just updated in MoapModule.SetMediaEntry.
2011-03-07 16:24:48 -08:00
Dan Lake
b1114dcb98
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
2011-03-07 16:03:50 -08:00
Dan Lake
e21176f974
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-07 15:58:36 -08:00
Dan Lake
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
Huaiyu (Kitty) Liu
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
Justin Clark-Casey (justincc)
9b345ebf73
factor out SetPartMediaFlags() function in MoapModule.
2011-03-05 02:42:47 +00:00
Justin Clark-Casey (justincc)
2e46027c14
Construct test load iar only once and reuse for each test, rather than recreating it every time
2011-03-05 02:34:44 +00:00
Justin Clark-Casey (justincc)
9e579a7891
Fold ClearMediaEntry() back into SetMediaEntry()
2011-03-05 02:21:53 +00:00
Justin Clark-Casey (justincc)
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
Mic Bowman
12d5a20094
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-04 17:18:49 -08:00
Mic Bowman
3c0d607f45
Changed order of checks for local regions when processing
...
AgentUpdate messages. Should improve throttles and reprioritization
when an avatar is moving.
2011-03-04 17:17:53 -08:00
Justin Clark-Casey (justincc)
8efb01b3df
minor: remove some mono compiler warnings
2011-03-05 01:15:27 +00:00
Justin Clark-Casey (justincc)
72cb498fd0
minor: Make MoapModule namespace consistent with other modules
2011-03-05 01:13:59 +00:00
Justin Clark-Casey (justincc)
481ca910da
add test for MoapModule.SetMediaUrl()
2011-03-05 01:07:05 +00:00
Justin Clark-Casey (justincc)
3c89527b22
Fix bug where llSetPrimMediaParams() reported success but never set the media texture.
...
We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script. This was being done when the viewer was setting them directly.
2011-03-05 00:06:51 +00:00
Robert Adams
59fbb9cbef
Restore physics bucket serialization that was lost in previous commit
2011-03-03 11:37:24 -08:00
Robert Adams
b76c233db3
Merge branch 'dev_kitty' into physbucket
...
Conflicts:
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
2011-03-03 08:54:01 -08:00
Huaiyu (Kitty) Liu
91e8fc50d3
Change Constants.RegionSize back to 256.
2011-03-01 14:50:33 -08:00
Robert Adams
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
Diva Canto
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
Robert Adams
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
Melanie
cea47491de
Fix a few little things
2011-02-27 19:49:23 +00:00
Robert Adams
11db34313d
Restore old PhysicsActor sync code. Not tested yet
2011-02-25 16:54:04 -08:00
Robert Adams
319c48f112
Restore old PhysActor synchronization routines
2011-02-25 16:30:52 -08:00
Huaiyu (Kitty) Liu
a5c55a19ef
Merge branch 'dev' into dev_kitty
2011-02-25 16:23:57 -08:00
Huaiyu (Kitty) Liu
f7de4f37ce
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-02-25 16:22:51 -08:00
Huaiyu (Kitty) Liu
9d613a20c0
Relocate functions within RegionSyncModule.cs: the IRegionSyncModule region now
...
only contains functions defined in IRegionSyncModule.
2011-02-25 16:20:58 -08:00
Robert Adams
153fd02f0f
Add SimianGridServiceConnector::LookupEndpoint to get info on a particular sync server endpoint
2011-02-25 16:03:35 -08:00
unknown
784cb6c95c
Changed some less important messages from Warn to Debug
2011-02-25 15:21:07 -08:00
Justin Clark-Casey (justincc)
2b04cab1ee
change some log messages from info to debug
2011-02-25 02:15:06 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
beff0ac32f
log actual cache directory for FlotsamAssetCache instead of always logging the default
2011-02-25 01:18:43 +00:00
Justin Clark-Casey (justincc)
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
Robert Adams
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
Robert Adams
2335968271
Adding SOG/SOP to ScenePresence working more but confusion on UUID of presence vs SOG
2011-02-24 14:41:16 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Mic Bowman
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
Mic Bowman
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
Marck
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
Robert Adams
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
Huaiyu (Kitty) Liu
513ca97eb0
Added code to propogate event OnAttach.
2011-02-18 17:05:25 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Huaiyu (Kitty) Liu
1d2a25689a
RegionSyncServer and RegionSyncClient will not trigger RezAttachment anymore. Attachments
...
are synced via object sync protocol.
2011-02-18 16:08:12 -08:00
Justin Clark-Casey (justincc)
9d668b09ca
remove unused code to share services between scenes in SceneSetupHelpers - this is done differently elsewhere
2011-02-19 00:07:16 +00:00
Justin Clark-Casey (justincc)
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
Huaiyu (Kitty) Liu
10a41ad5b5
Added code in SceneGraph.AddSceneObjectByStateSynch to handle attachment objects.
2011-02-18 15:49:01 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5c92f62941
minor: remove mono compiler warning
2011-02-18 23:10:46 +00:00
Justin Clark-Casey (justincc)
dd9efc1838
extend TestChildAgentEstablished() test slightly to put in EntityTransferModule. Not yet enabled.
2011-02-18 23:05:56 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
023f953f39
remove another unused test teardown method
2011-02-18 22:25:45 +00:00
Justin Clark-Casey (justincc)
c155f57dbe
remove unused test teardown method
2011-02-18 22:22:51 +00:00
Justin Clark-Casey (justincc)
c763edf56d
separate attachment tests out into their own class
2011-02-18 22:20:08 +00:00
Justin Clark-Casey (justincc)
60d47836ce
minor: remove mono compiler warning
2011-02-18 22:00:52 +00:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e774679f62
minor: add method doc to a few ScenePresence methods
2011-02-18 21:19:16 +00:00
Justin Clark-Casey (justincc)
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
Robert Adams
a25eac0a40
Remove old physics sync code. Attempt to fake ScenePresence in physics bucket sync
2011-02-18 08:11:29 -08:00
Marck
4f9c3c73ad
Add support for new naming syntax of linked regions to osTeleportAgent and osTeleportOwner.
2011-02-17 13:47:13 +01:00
Marck
47a5d8d742
Make osTeleportOwner work in foreign regions by relaxing the restrictions on teleporting an agent.
2011-02-17 13:47:12 +01:00
Robert Adams
c9c94a5f23
Physics bucket packing and unpacking
2011-02-16 17:11:16 -08:00
Huaiyu (Kitty) Liu
3d1048f1e2
In SOG.UpdateGroupPosition, added AttachedPos as an updated property is the object is an attachment.
2011-02-16 16:57:47 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
f99b516eec
Added serialization/deserilaization of Attachment related SOP properties to sync AttachObject.
2011-02-16 14:29:08 -08:00
Diva Canto
dd4a503a22
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-16 09:57:43 -08:00
Diva Canto
c6f2d66eae
Fix bug introduced by Query Access. The response does not come in a packaged _Result field, it comes as simple OSDMap with 2 fields in it.
...
Also in this commit: comment out irrelevant debug message on AuthService.
2011-02-16 09:57:12 -08:00
Marck
25265c964f
Changed console command "alert" and added new command "alert-user".
...
This addresses Mantis #4709 .
Command "alert" always sends a message to everybody; the variant "alert general" has been removed. Sending messages to one user is done with the dedicated command "alert-user".
2011-02-16 18:36:57 +01:00
Marck
5c15c5e0ff
Changed default directory for storing map tile images from remote regions.
2011-02-16 18:36:40 +01:00
Diva Canto
fc84225038
XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386
2011-02-16 08:18:49 -08:00
Melanie
918c12c965
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 08:06:11 +00:00
Huaiyu (Kitty) Liu
e66668ad7e
Some conflict, probably due to line ending at LocalGridServiceConnector.cs. Just commit the difference to move on.
2011-02-15 15:07:43 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
94e433315e
Added code to send and receive SymmetricSyncMessage.MsgType.UpdatedBucketProperties sync message.
2011-02-15 14:02:53 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
f05502f3fe
Merge branch 'dev' into dev_kitty
2011-02-14 14:56:48 -08:00
Huaiyu (Kitty) Liu
41c85d9fd1
Changed interface of ScheduleFullUpdate and ScheduleTerseUpdate, and pass a list of updatedProperties as the argument.
2011-02-14 13:54:34 -08:00
Dan Lake
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
Huaiyu (Kitty) Liu
2b2eb4dbe3
Merge branch 'dev_kitty' into dev
2011-02-14 11:36:57 -08:00
Huaiyu (Kitty) Liu
b31fa7d8fe
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-02-14 11:36:25 -08:00
Huaiyu (Kitty) Liu
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
Robert Adams
4d343d0fea
Move actor registration to actor modules. Add physics registation
2011-02-14 09:37:36 -08:00
BlueWall
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
Marck
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
Diva Canto
c169a62f55
Typo
2011-02-12 18:05:25 -08:00
Diva Canto
a8ced66e87
Improved error message on TP failure
2011-02-12 07:28:21 -08:00
Justin Clark-Casey (justincc)
9801bf03f8
minor: add comment explaining that GetRegionsByName needs to stay in TeleportAgent for its side effects.
2011-02-12 01:14:12 +00:00
Justin Clark-Casey (justincc)
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
Huaiyu (Kitty) Liu
63e35d53f7
Added implementation of GeneralBucketUpdateProcessor and PhysicsBucketUpdateProcessor
2011-02-11 16:51:38 -08:00
Justin Clark-Casey (justincc)
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
Huaiyu (Kitty) Liu
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
Robert Adams
9970677ed8
Quark/Endpoint registration and lookup for three table database
2011-02-11 15:50:25 -08:00
Justin Clark-Casey (justincc)
26727ee044
refactor: split out estate management commands into separate class
2011-02-11 23:32:38 +00:00
Huaiyu (Kitty) Liu
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
8fd58aa00c
add estate name to show regions console command
2011-02-11 22:10:02 +00:00
Huaiyu (Kitty) Liu
5ef659520e
Access to sop.Shape.Scale replaced by sop.Scale.
2011-02-10 17:06:15 -08:00
Huaiyu (Kitty) Liu
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
Huaiyu (Kitty) Liu
1da933041c
Started to added new access functions of SOP properties.
2011-02-10 11:37:34 -08:00
Diva Canto
45382e6f82
Reinstated a couple of null checks related to the previous revert.
2011-02-10 06:26:26 -08:00
Diva Canto
89bb5c0941
Revert "Hunting down mantis #5365"
...
This reverts commit ebeef02fef
.
2011-02-10 06:09:04 -08:00
Diva Canto
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
Robert Adams
4fe0bd32d4
Actor/Quark registration for Simian backend
2011-02-09 17:17:50 -08:00
Huaiyu (Kitty) Liu
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
Diva Canto
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
Diva Canto
1cd951e5ae
Fix the negative number problem in TokenBucket. mantis #5365
2011-02-09 09:39:53 -08:00
Diva Canto
830fee145d
Revert "Brute-force debug -- mantis #5365"
...
This reverts commit 585473aade
.
2011-02-09 08:35:36 -08:00
Diva Canto
1bba9c6300
Revert "Don't build strings unless we're in emergency debugging."
...
This reverts commit ba202ea9b0
.
2011-02-09 08:35:21 -08:00
Diva Canto
477a869fb2
More detection of negatives.
2011-02-09 08:08:57 -08:00
Diva Canto
473fac4dc7
Detect negative dripAmounts in TokenBuckets. These negatives result from overflown integer operations. Also added Total to the scene throttles in show throttles.
2011-02-09 08:06:20 -08:00
Diva Canto
ba202ea9b0
Don't build strings unless we're in emergency debugging.
2011-02-08 21:09:10 -08:00
Diva Canto
585473aade
Brute-force debug -- mantis #5365
2011-02-08 20:12:33 -08:00
Diva Canto
117462cba1
Avoid potential race conditions on UseCircuitCode. I artificially made the race condition happen, and got very similar results to those described in mantis #5365 -- no prims/avie sent back.
2011-02-08 17:53:01 -08:00
Huaiyu (Kitty) Liu
2dc857b31d
Added code to serialization/deserialize LocalFlags. Need further testing to see if it's necessary.
2011-02-08 15:55:00 -08:00
Huaiyu (Kitty) Liu
e8e9a0fb43
Enabled all synchronized properties to be updated by calling through SetXXX() to set values.
2011-02-08 15:33:54 -08:00
Diva Canto
f431bd20ec
Minor addition to the previous commit
2011-02-08 14:49:50 -08:00
Diva Canto
82846afe4b
Minor improvement to previous commit.
2011-02-08 12:37:37 -08:00
Diva Canto
ac7bc78555
Added emergency monitoring of UDP Outgoing packets thread. Just type "emergency-monitoring on/off"
2011-02-08 12:06:14 -08:00
Diva Canto
34bd41d186
Comment previous debug
2011-02-08 11:16:38 -08:00
Huaiyu (Kitty) Liu
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
Diva Canto
305c755cfb
XFF header again -- debug.
2011-02-08 07:50:01 -08:00
Diva Canto
d627122cdc
Mantis #5368 -- exception on WorldMap
2011-02-07 19:44:55 -08:00
Huaiyu (Kitty) Liu
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
Diva Canto
d934add021
Thanks Tokeiito for noticing this bug. mantis #5366
2011-02-07 14:49:18 -08:00
Huaiyu (Kitty) Liu
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
Diva Canto
ebeef02fef
Hunting down mantis #5365
...
Revert "refactor: remove redundant null checks"
This reverts commit 6e58996b4d
.
2011-02-07 07:45:03 -08:00
Diva Canto
98ea78fc77
New command: show pending-objects
2011-02-06 19:39:29 -08:00
Diva Canto
2c7e87c45b
Better output for show neighbours
2011-02-06 07:51:20 -08:00
Diva Canto
3411d4867d
Honor check of m_Enabled in WorldViewModule.
2011-02-05 19:40:55 -08:00
Diva Canto
cc81d924ca
Fixed Caps handlers leak
2011-02-05 19:34:02 -08:00
Diva Canto
30fa5ad1e2
One more diagnosis command:
...
show caps
2011-02-05 19:21:12 -08:00
Diva Canto
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
Diva Canto
3a2a48a8ca
Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still supported for backwards compatibility, but will be removed in the future.
2011-02-05 08:20:13 -08:00
Diva Canto
67555994ad
Amend to yesterday's deletions: forgot to delete the RemoteInventory module in th addin.xml file.
2011-02-05 07:55:54 -08:00
Melanie
f78831ec98
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-02-05 04:25:14 +00:00
Melanie
4e0b0f0f4c
Fix a typo in the QUERYACCESS method name
2011-02-05 04:24:43 +00:00
Diva Canto
632babf8fb
Added an additional debug message, and removed a bunch of files that weren't being used anymore -- the old RemotsInventory connectors stuff.
2011-02-04 19:19:38 -08:00
Diva Canto
f5a3eb9fd5
Added a config var to HGInventoryAccessModule called OutboundPermission that controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things...
2011-02-04 17:05:45 -08:00
Huaiyu (Kitty) Liu
c929348668
Majority of SOP properties have set functions added.
2011-02-04 17:05:08 -08:00
Justin Clark-Casey (justincc)
cdd64bb8f5
For now, reinstate the call to World.GridService.GetRegionsByName() commented out in 933f47e
...
Even though we don't use the results, just getting the regions may have side effects in making hypergrid links available for the later World.RequestTeleportLocation()
2011-02-05 00:15:25 +00:00
Justin Clark-Casey (justincc)
1ffd70cef7
minor: remove some mono compiler warnings
2011-02-04 23:20:10 +00:00
Justin Clark-Casey (justincc)
5b7a5a5b8b
Add position to IM sent from llInstantMessage(), to better fulfill client expectations
2011-02-04 23:14:21 +00:00
Justin Clark-Casey (justincc)
a51005aacd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 23:08:27 +00:00
Justin Clark-Casey (justincc)
722f0ba18c
Put something in the ImprovedInstantMessage.BinaryBucket for llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with this).
...
We're putting in a string of format "<region name><x pos floor int><y pos floor int><z pos floor int> which appears to be the expected value.
This resolves http://opensimulator.org/mantis/view.php?id=5356
2011-02-04 23:07:47 +00:00
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
Mic Bowman
bb69a40fbb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 14:22:17 -08:00
Mic Bowman
7a6e1fa4cf
Convert SimianMaptile refresh time from ms to seconds. Too many 0's
...
in the config file.
2011-02-04 14:21:18 -08:00
Justin Clark-Casey (justincc)
bc2e254b55
minor: fix indentation, spacing on commit 3585130
...
this previous commit tries to look up the texture by name first before just using the uuid.
this allows correct resolution of inventory textures which have uuids as names.
2011-02-04 21:55:22 +00:00
unknown
3585130ac8
SetTexture_fix
2011-02-04 21:52:06 +00:00
Justin Clark-Casey (justincc)
456cdee5ce
minor: correct a log spelling mistake that was pointed out to me
2011-02-04 21:42:45 +00:00
Justin Clark-Casey (justincc)
2ddec29c61
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 21:15:41 +00:00
Diva Canto
144f367863
Bug fixed on map search for HG. Affected queries that had a region name at the end.
2011-02-04 12:57:22 -08:00
Kevin Cozens
034327b51f
Send object date to viewer in microseconds (Fixes mantis bug #3990 )
2011-02-04 20:55:41 +00:00
Justin Clark-Casey (justincc)
1613d89383
minor: Correct misspelling of neighbour in log messages.
...
Thanks Fly-Man-
2011-02-04 20:51:51 +00: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
Robert Adams
f5870a1e23
slight optimization in the actor registration code
2011-02-04 09:25:54 -08:00
Justin Clark-Casey (justincc)
ba8826d2b8
Fix "set log level" to once again display current log level if it's not given a parameter
...
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00: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
Mic Bowman
cf24069227
Change UpdateAgent (for changes in agent position) to be sent
...
once to each simulator rather than once to each region. This
should help with some of the delays caused by multiple outstanding
requests to a single service point.
2011-02-03 12:43:46 -08:00
Huaiyu (Kitty) Liu
97b01dcf75
check in updates in enabling bucket based synchronization.
2011-02-03 12:01:08 -08:00
Diva Canto
8fdc810a23
Addresses mantis #5360 : CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
2011-02-03 04:07:36 -08:00
Robert Adams
4a4ecb1cde
Initial stubs and code for quark/actor registration and lookup
2011-02-02 17:34:53 -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
Justin Clark-Casey (justincc)
4f7cf491e6
Comment out texture CAPS 'texture not found' message for now
2011-02-02 20:02:10 +00:00
Justin Clark-Casey (justincc)
2413e9eb3f
Record number of resent packets in LindenUDP stack and display in stats report
2011-02-02 20:00:50 +00:00
Justin Clark-Casey (justincc)
2344150b6e
Stop double counting dequeued packets for packets sent number
...
This is already being incremented in LLUDPServer.SendPacketFinal for every packet
2011-02-02 19:39:33 +00: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
Justin Clark-Casey (justincc)
0898be5750
Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership() so that it returns null if the user isn't a member of the group.
...
This matches the behaviour of the same method for Flotsam Groups. This is the behaviour assumed by existing code.
Method doc also added to IGroupsServicesConnector to the make the contract clear.
2011-01-31 22:54:36 +00: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
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
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