BlueWall
37d2b6243b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 21:16:30 -04:00
BlueWall
40bf417da7
Add ColladaMesh switch
2011-04-14 21:15:42 -04:00
Justin Clark-Casey (justincc)
66a62678e5
get rid of all traces of the now used mock service infrastructure
2011-04-15 01:37:27 +01:00
Justin Clark-Casey (justincc)
ad70cddcfc
extend TestLoadCoalesecedItem() to check loaded object ids and positions
2011-04-15 00:56:40 +01:00
Justin Clark-Casey (justincc)
a0d80140f2
Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.
...
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
2011-04-15 00:42:06 +01:00
Justin Clark-Casey (justincc)
821e67fb95
implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.
2011-04-14 20:59:52 +01:00
Justin Clark-Casey (justincc)
55387542ea
simplify InventoryArchiveTestCase setup
2011-04-14 20:35:00 +01:00
Justin Clark-Casey (justincc)
1569148b49
simplify TestSaveItemToIarV0_1()
2011-04-14 20:32:27 +01:00
Diva Canto
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
Justin Clark-Casey (justincc)
6ae76ede98
suspend check that IAR control file is loaded for now
...
I was mistaken - some previous opensim versions don't save this file first. Will have to bump iar version number and only check iars after the bump
2011-03-31 23:09:06 +01:00
Justin Clark-Casey (justincc)
6ae04448f7
Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
...
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
2011-03-25 23:05:51 +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
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
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)
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)
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)
2b04cab1ee
change some log messages from info to debug
2011-02-25 02:15:06 +00: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
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
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)
ab1ec3c3cc
minor: remove a few mono compiler warnings
2011-01-28 21:51:25 +00:00
Mic Bowman
c4727645b8
Removed a few more spurious appearance saves. When an avatar
...
enters a region the attachments module tries to update the
appearance with attachments that are already part of the appearance.
Just added a check to only save if the attachments weren't there
before.
2011-01-25 14:23:58 -08:00
Justin Clark-Casey (justincc)
41105948bd
remove some mono compiler warnings
2011-01-21 23:19:52 +00:00
Justin Clark-Casey (justincc)
d3dca7d25a
For now, comment out logging messages about IM sending, since these cause high spam for large group messaging
2011-01-19 01:50:02 +00:00
Justin Clark-Casey (justincc)
28fda1cab6
with mic's permission, reduce appearance, baked texture logging verbosity for now
2011-01-19 01:41:32 +00:00
Justin Clark-Casey (justincc)
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
Justin Clark-Casey (justincc)
97c0430093
Downgrade and comment out some other caps messages for now
2011-01-19 01:10:09 +00:00
Melanie
9f7b37b37c
Fix build break
2011-01-18 01:48:37 +00:00
Melanie
ac16a49ca0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-18 01:27:11 +00:00
Melanie
31144a62b3
Change gesture activation to not quash any other flags
2011-01-18 01:26:37 +00:00
Justin Clark-Casey (justincc)
c544f0d0c5
Prune some of the excess logging for client logins.
...
Didn't touch the appearance related stuff.
2011-01-18 00:25:24 +00:00
Diva Canto
35a2961ccd
Added a -v|verbose option to save iar.
2011-01-08 16:17:00 -08:00
Melanie
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
Melanie
990e73d7cb
Fix a broken format on an error message. Also replace yet another e.Message
...
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
Justin Clark-Casey (justincc)
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
