Dan Lake
6e13ddf072
Added Mic's update logging patch
2011-03-21 15:21:55 -07:00
Huaiyu (Kitty) Liu
fb8a91bc8d
Removed some debug logs, and changed some from Debug to DebugFormat.
2011-03-21 14:51:03 -07:00
Justin Clark-Casey (justincc)
d3a20a1e92
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
2011-03-21 21:37:06 +00:00
Melanie
fb890e543f
Don't send a windlight profile to clients if windlight is not set for
...
that region. This should restore normal day and night cycles for
regions without WL settings.
2011-03-21 08:02:56 +00:00
Huaiyu (Kitty) Liu
83b4d4121e
Added CopyRight disclaimers in RegionSyncModule files.
2011-03-18 13:59:33 -07:00
Dan Lake
9704793a1c
Refreshed from dev, fixed merge problems with packet category logging. (by removing the debug feature)
2011-03-18 12:36:09 -07:00
BlueWall
f4a30f3a23
Upgrade SQLite:
...
Fixes metadata issues. Tested on Linux and Windows - may fix
issues seen on OSx as well.
2011-03-18 12:12:08 -04:00
Huaiyu (Kitty) Liu
b7dc2af5e6
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-17 17:20:58 -07:00
Huaiyu (Kitty) Liu
4076cb4a3c
Fixed a bug in RegionSyncModule.SendSceneUpdates: if there are no SyncConnectors in connection,
...
clear the update list before return.
Also, if a SyncConnector receives a request GetObject, only sends back NewObject to that SyncConnector.
2011-03-17 17:18:16 -07:00
Dan Lake
ab6b9e5812
Changed warning to debug message for outgoing packet queues
2011-03-17 14:10:01 -07:00
Robert Adams
6e251b13c4
Merge branch 'dev' into collisionevent
2011-03-17 10:31:16 -07:00
Robert Adams
74903876eb
Collision events generated by physics engine and processed by script engine.
2011-03-17 10:29:03 -07:00
BlueWall
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
Huaiyu (Kitty) Liu
0df0e92ff0
In RegionSyncModule.DoInitialSync(), calling DeleteAllSceneObjectsBySync() instead of DeleteAllSceneObjects().
2011-03-16 16:36:54 -07:00
Huaiyu (Kitty) Liu
271f460bae
Handler of SymmetricSyncMessage.MsgType.UpdatedObject changed to HandleUpdateObjectBySynchronization,
...
that is, since we add objects in scene by sending around NewObject, we no longer "add" objects after
receiving UpdateObject.
Also, ProcessBackup is now only executed by Persistece Actor (ScenePersistenceSyncModule, if configured
to run, will set each SOG's ToPersistObjectState to true).
2011-03-16 11:32:26 -07:00
Huaiyu (Kitty) Liu
a8c722bead
Added code to encode and decode all object properties, including those in Physics bucket,
...
to sending and handling received NewObject sync message.
Also, NewObject, RemoveObject, and LinkObject are now all sent out via
SendSceneEventToRelevantSyncConnectors, that is, they are sent out on wire right away,
not enqueue first.
2011-03-16 09:32:27 -07:00
Justin Clark-Casey (justincc)
04e3ae3733
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-16 00:15:48 +00:00
Justin Clark-Casey (justincc)
aadd0e8d42
minor: bring comment into line with code reality
2011-03-16 00:14:58 +00:00
BlueWall
d4ed38821f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-15 17:17:28 -04:00
BlueWall
28c335e25f
Hello, World!
2011-03-15 17:16:50 -04:00
Huaiyu (Kitty) Liu
04ef2366c2
Merge branch 'dev' of ssh://sceneapi@island.sciencesim.com/home/sceneapi/sceneapi into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-03-15 11:26:46 -07:00
Huaiyu (Kitty) Liu
3d17bd5654
Reimplement logic in RegionSyncModule so that a SyncRelay node (e.g. PSA) only sends out updates for a bucket
...
that has properties updated in the last update interval: the previous implemenation has some flaws in design.
2011-03-15 11:21:46 -07:00
Dan Lake
afca24acbe
Added some debugging for queues. Temporary change
2011-03-14 22:37:09 -07:00
Dan Lake
10e405704a
Added some debugging for queues. Temporary change
2011-03-14 22:17:51 -07:00
Dan Lake
7bcab8e975
Added some debugging for queues. Temporary change
2011-03-14 21:41:47 -07:00
Justin Clark-Casey (justincc)
fdcf910e00
Fix a bug in T015_LargeSceneObjects() where the large scene object was stored 31 times (1 time for each added part) instead of once at the end, even though only the largest 31 prim scene object was retrieved and tested.
...
This considerably speeds up the test, when on sqlite it now only takes 2 seconds rather than 30+
2011-03-14 23:35:03 +00:00
Justin Clark-Casey (justincc)
38c3be07b8
when retrieving a sog in database tests, don't bother adding the scene since this isn't used
2011-03-14 23:32:44 +00:00
Justin Clark-Casey (justincc)
8509678e48
Add method doc to T015_LargeSceneObjects() and slightly clean up formatting.
...
This test takes a considerable time on SQLite but should remain since it's testing storage and retrieval of a scene object with 31 parts.
2011-03-14 23:26:50 +00:00
Justin Clark-Casey (justincc)
48c62eb51b
Add current method output to all persistence level tests so that we can track where we are in the test suite
2011-03-14 23:17:15 +00:00
Justin Clark-Casey (justincc)
9885f68f44
When setting media on a prim values, use generic object permissions instead of media permissions.
...
Media permissions are just meant to be checked when we want to know if a user should be shown the navigation bar or allowed to navigate. It should not be checked when we're setting the media up.
This bug was preventing a user from ever setting any more values if they had unchecked the owner settings.
2011-03-14 22:47:14 +00:00
Justin Clark-Casey (justincc)
2868f3fc72
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-14 21:56:58 +00:00
Dan Lake
7a89cf5a68
Merge branch 'dev' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into dev
2011-03-14 12:52:52 -07:00
Dan Lake
3bdc04acf3
Added some debugging for queues. Temporary change
2011-03-14 12:52:10 -07:00
Melanie
cee5e3e264
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 14:51:13 +00:00
Justin Clark-Casey (justincc)
f6f8d124d1
minor: remove mono compiler warning
2011-03-12 00:52:43 +00:00
Justin Clark-Casey (justincc)
f6b638fec9
factor inventory file loading into its own method
2011-03-12 00:49:13 +00:00
Justin Clark-Casey (justincc)
c4060e56ef
factor out iar asset load code into its own method
2011-03-12 00:35:40 +00:00
Robert Adams
d5acb9a214
Merge branch 'dev' into syncstats
2011-03-11 16:34:50 -08:00
Huaiyu (Kitty) Liu
4803745c0d
Added logic in RegionSyncModule so that a SyncRelay node (e.g. PSA) only sends out updates for a bucket
...
that has properties updated in the last update interval.
2011-03-11 16:29:10 -08:00
Justin Clark-Casey (justincc)
a3c7c04ead
refactor: make boolean load indicators on load iars instance fields
2011-03-12 00:28:23 +00:00
Justin Clark-Casey (justincc)
367ed585e0
introduce iar load checks which make sure archive.xml comes first, then inventory nodes, then assets
...
this is necessary for correct loading. "save iar" always saves in this order so there shouldn't be any problems - these checks are to give better feedback to other systems that may construct IARs.
2011-03-12 00:21:52 +00:00
Robert Adams
d70deaaa64
Merge branch 'dev' into syncstats
...
Conflicts:
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-03-11 16:02:00 -08:00
Robert Adams
e72f08e02a
Default physics logging to off
2011-03-11 15:56:33 -08:00
Robert Adams
9edbbf2728
sync logging added to RegionSyncModule
2011-03-11 15:42:39 -08:00
Huaiyu (Kitty) Liu
37dd39fd5d
Added SendNewObject to explicitly send out NewObject sync message when new objects are added.
2011-03-11 15:39:06 -08:00
Justin Clark-Casey (justincc)
cb863851e0
Update/simplify test running instructions
2011-03-11 22:38:51 +00:00
Huaiyu (Kitty) Liu
48ad2010e5
removed some debug message.
2011-03-11 13:54:09 -08:00
Huaiyu (Kitty) Liu
1ab4df9954
In RegionSyncModule.PrimUpdatesPhysicsBucketSender, if no PhysicsActor for the SOP, still sending out
...
"GroupPosition" and a few other properties in physics bucket. Sync'ing of phantom objects now seems working fine.
2011-03-11 11:50:46 -08:00
Huaiyu (Kitty) Liu
13798f9f7d
Fixed bugs in llCreateLink to sync LinkObject properly.
...
Also, added logs for debug purposes.
2011-03-11 09:22:32 -08:00
Mic Bowman
836ab6b0e8
Change how map blocks are encoded to make map search
...
work with viewer 2.
2011-03-10 15:23:46 -08:00