Commit Graph

14571 Commits (f8bf6c2cc462014af7ae2f3ae91e9b7b0ef1d180)

Author SHA1 Message Date
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
Justin Clark-Casey (justincc) ad1dea5aff Add test for simple case where creator account with appropriate uuid exists on the target system for an iar load 2011-03-10 22:56:11 +00:00
Justin Clark-Casey (justincc) 8d69e68311 refactor: rename test user account fields 2011-03-10 22:52:41 +00:00
Justin Clark-Casey (justincc) 9ecb745ed7 factor out common scene setup code in InventoryArchiveTestCase 2011-03-10 22:48:19 +00:00
Justin Clark-Casey (justincc) 66d2d35425 extend TestLoadIarV0_1AbsentCreator() to check serialized object CreatorId as well 2011-03-10 22:40:24 +00:00
Justin Clark-Casey (justincc) ce4421497e re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator() 2011-03-10 22:38:52 +00:00
Robert Adams 7f6529af4e Merge branch 'dev' into syncstats 2011-03-10 14:13:41 -08:00
Robert Adams a1fa5c28c3 Add sync statistics collector class 2011-03-10 14:05:59 -08:00
Robert Adams cc2a679121 Sync statistics to a file 2011-03-10 14:04:10 -08:00
Justin Clark-Casey (justincc) b821f748ac For objects loaded from an IAR, make sure the CreatorID points towards the OSP resolved ID if newer CreationData is not present.
This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account.
This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists.  This operation might be expensive for sculpties where the sculpt texture is inlined with the object data.  Will just have to see.
This relies on the IAR streaming inventory data before asset data (as is currently the case).  Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file).
This is for IAR loading only.  Tests updated to check this behaviour.
2011-03-10 21:56:15 +00:00
Justin Clark-Casey (justincc) db2ad62c9b in AssetHelpers.CreateAsset(), create objects using the 'original' xml format rather than 'xml2' 2011-03-10 19:52:19 +00:00
Justin Clark-Casey (justincc) a151afebe3 When setting up default iar for testing, use iar archiving code rather than constructing the tar manually 2011-03-10 19:40:19 +00:00
Huaiyu (Kitty) Liu b848df2a3a In LSL_Api.cs, no special checking of if ScriptEngineToSceneConnectorModule exist anymore --
async model is no longer used and we get rid of the old code.
2011-03-09 17:16:03 -08:00
Huaiyu (Kitty) Liu e4bdaaaa83 Added SyncStateReport function in RegionSyncModule to do some preliminary sync state comparison. 2011-03-09 16:31:53 -08:00
Justin Clark-Casey (justincc) 4dd60b7dce Change existing users load iar test so that it fulfills it's original intention (i.e. OSPA resolution, which is still active).
Will need to write a separate test for the simplest case where creator accounts with appropriate uuids exist on iar load.
2011-03-10 00:19:17 +00:00
Justin Clark-Casey (justincc) 549b0ea17c Split the inventory path testing parts of TestLoadIarV0_1ExistingUsers() into a new test TestLoadIarToInventoryPaths() 2011-03-10 00:06:32 +00:00
Justin Clark-Casey (justincc) fa1996155e Make the item created in the default test iar an object rather than a script 2011-03-09 23:58:26 +00:00
Justin Clark-Casey (justincc) 07f68c8318 minor: change the order of some default iar setup in test case 2011-03-09 23:54:52 +00:00
Justin Clark-Casey (justincc) 9456bb77fb Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
Justin Clark-Casey (justincc) 20aeace8d7 Add log messages on teleport failure to better pin down the cause. 2011-03-09 22:03:12 +00:00
Justin Clark-Casey (justincc) 3e5b1a1de5 Update MySql.Data.dll to version 6.3.6.
This version fixes a bug so that MySqlCommand.CommandTimeout = 0 now correctly sets an infinite command timeout.  This might help with failures on long-running migrations.
The mysql.data.dll v2 is used from the mysql package (as opposed to v4).  The v4 version (probably standing for NET 4.0) does not work under mono 2.6.7, which is still commonly used.
2011-03-09 20:55:44 +00:00
Justin Clark-Casey (justincc) ae507bb060 Split out path tests from InventoryArchiveTests. Factor common code into test case parent 2011-03-09 01:53:27 +00:00
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