ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-05 10:35:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,687 Commits 5 Branches 96 Tags
95e524dde100aa14d71a49ee5d5f0cc4b5fa45f7
Commit Graph

1993 Commits

Author SHA1 Message Date
Melanie
95e524dde1 A stab at making CHANGED_OWNER work 2011-04-01 18:49:53 +02:00
Melanie
a62b435a39 Merge branch 'master' into careminster-presence-refactor 2011-03-27 21:41:54 +01:00
Melanie
f25749f025 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-03-27 21:22:31 +01:00
Justin Clark-Casey (justincc)
7f5019b0f2 Add ILandObject.IPrimCounts for the new prim count module. 
Not functional yet, but tests now act against this object rather than interrogating the module directly
 2011-03-25 21:47:54 +00:00
Justin Clark-Casey (justincc)
eaa37d15f2 factor out common test setup code in PCM tests 2011-03-23 23:28:23 +00:00
Justin Clark-Casey (justincc)
f001aab8aa extend TestAddOwnerObject() to add a second object 2011-03-23 23:19:15 +00:00
Justin Clark-Casey (justincc)
ebbe3afaf1 Add PrimCountModuleTests.TestRemoveOwnerObject(). 
Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs
 2011-03-23 23:14:55 +00:00
Justin Clark-Casey (justincc)
de88227bc4 refactor: simplify part of AddSceneObject() test setup by moving sog construction into SceneSetupHelpers.CreateSceneObject() 2011-03-23 22:29:27 +00:00
Justin Clark-Casey (justincc)
88673c86a4 use a 3 part object for the pcm test rather than a 1 part, for improved test coverage 2011-03-23 22:17:47 +00:00
Justin Clark-Casey (justincc)
f1f4985ab6 user a non UUID.Zero user in pcm test to avoid any special treatment of UUID.Zero 2011-03-23 22:14:04 +00:00
Justin Clark-Casey (justincc)
654aa7abeb Extend simple PCM add object test to check all counts 2011-03-23 22:12:20 +00:00
Justin Clark-Casey (justincc)
08c3cd6b36 Add method doc to the Get*() methods on PrimCountModule 2011-03-23 22:04:14 +00:00
Justin Clark-Casey (justincc)
67cafbd33a remove a rogue Console.WriteLine() from the last commit. 2011-03-23 21:54:02 +00:00
Justin Clark-Casey (justincc)
d011896341 Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to listen for that rather than EventManager.OnParcelPrimCountAdd 
OnParcelPrimCountAdd had the wrong semantics for the PrimCountModule - it was invoked for every entity in the scene, not just new ones, which would screw up the untainted count.
Extend automated test for this scenario.
 2011-03-23 21:53:14 +00:00
Justin Clark-Casey (justincc)
b34743e5fe Add an initial confidence-building TestAddObject() for prim counts. 2011-03-22 23:47:36 +00:00
Melanie
3dc9b0ef18 Remove a spammy debug 2011-03-23 00:32:19 +01:00
Melanie
78a7c6cace Remove the forced landmark and home poermissions because they are now in the 
database
 2011-03-23 00:02:41 +01:00
Melanie
edf9f3d630 Raise the position for lures by 2m to prevent the target avatar getting stuck 
in a prim.
 2011-03-23 00:01:41 +01:00
Melanie
c330f89fb1 Add some more fields to Estate settings and make them work. 
Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1;
to make this work.
 2011-03-22 10:43:43 +01:00
Tom
b70596c15c Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2011-03-21 13:31:22 -07:00
Tom
4d4765aa28 Since we've plugged the leak, now increase URLs to 5000 since the limit is being hit in several sims 2011-03-21 13:30:53 -07: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
Melanie
e4f143fb1c Merge branch 'master' into careminster-presence-refactor 2011-03-21 07:57:56 +00:00
Melanie
7b11a83c08 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 05:52:29 +01:00
BlueWall
a3651eb5d0 Thanks Kevin Cozens for a patch that: 
Fixes several spelling mistakes
 2011-03-17 05:48:42 -04: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
Melanie
3dc877c59f Merge branch 'master' into careminster-presence-refactor 2011-03-14 14:48:00 +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
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
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
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)
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
Melanie
9165a5207d Merge branch 'master' into careminster-presence-refactor 2011-03-10 07:14:03 +00: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)
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)
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
Justin Clark-Casey (justincc)
9b345ebf73 factor out SetPartMediaFlags() function in MoapModule. 2011-03-05 02:42:47 +00:00