aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-178-61/+117
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-143-9/+9
| |\
| | * get rid of all traces of the now used mock service infrastructureJustin Clark-Casey (justincc)2011-04-153-9/+9
| * | Add ColladaMesh switchBlueWall2011-04-142-3/+21
| |/
| * extend TestLoadCoalesecedItem() to check loaded object ids and positionsJustin Clark-Casey (justincc)2011-04-151-1/+7
| * Make all the objects in a coalescence reappears after being loaded from an IA...Justin Clark-Casey (justincc)2011-04-153-26/+47
| * implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.Justin Clark-Casey (justincc)2011-04-142-4/+48
| * simplify InventoryArchiveTestCase setupJustin Clark-Casey (justincc)2011-04-141-18/+2
| * simplify TestSaveItemToIarV0_1()Justin Clark-Casey (justincc)2011-04-141-18/+2
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-122-2/+1
| * suspend check that IAR control file is loaded for nowJustin Clark-Casey (justincc)2011-03-311-1/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-011-0/+1
|\ \ | |/
| * Start using IPrimCounts populated by PrimCountModule instead of LandData coun...Justin Clark-Casey (justincc)2011-03-251-0/+1
* | Remove a spammy debugMelanie2011-03-231-2/+2
* | Raise the position for lures by 2m to prevent the target avatar getting stuckMelanie2011-03-231-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-144-132/+269
|\ \ | |/
| * factor inventory file loading into its own methodJustin Clark-Casey (justincc)2011-03-121-57/+80
| * factor out iar asset load code into its own methodJustin Clark-Casey (justincc)2011-03-121-29/+40
| * refactor: make boolean load indicators on load iars instance fieldsJustin Clark-Casey (justincc)2011-03-121-8/+11
| * introduce iar load checks which make sure archive.xml comes first, then inven...Justin Clark-Casey (justincc)2011-03-121-1/+32
| * Add test for simple case where creator account with appropriate uuid exists o...Justin Clark-Casey (justincc)2011-03-101-0/+32
| * refactor: rename test user account fieldsJustin Clark-Casey (justincc)2011-03-103-35/+35
| * factor out common scene setup code in InventoryArchiveTestCaseJustin Clark-Casey (justincc)2011-03-102-41/+33
| * extend TestLoadIarV0_1AbsentCreator() to check serialized object CreatorId as...Justin Clark-Casey (justincc)2011-03-101-0/+6
| * re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()Justin Clark-Casey (justincc)2011-03-102-5/+6
| * For objects loaded from an IAR, make sure the CreatorID points towards the OS...Justin Clark-Casey (justincc)2011-03-102-8/+42
| * When setting up default iar for testing, use iar archiving code rather than c...Justin Clark-Casey (justincc)2011-03-103-13/+17
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-105-602/+661
|\ \ | |/
| * Change existing users load iar test so that it fulfills it's original intenti...Justin Clark-Casey (justincc)2011-03-102-11/+15
| * Split the inventory path testing parts of TestLoadIarV0_1ExistingUsers() into...Justin Clark-Casey (justincc)2011-03-102-23/+46
| * Make the item created in the default test iar an object rather than a scriptJustin Clark-Casey (justincc)2011-03-091-2/+27
| * minor: change the order of some default iar setup in test caseJustin Clark-Casey (justincc)2011-03-091-5/+7
| * Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-093-3/+0
| * Split out path tests from InventoryArchiveTests. Factor common code into tes...Justin Clark-Casey (justincc)2011-03-093-531/+562
| * Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make sta...Justin Clark-Casey (justincc)2011-03-092-50/+17
| * Make -m shortcut option for --merge on load iar specific. Correct some log m...Justin Clark-Casey (justincc)2011-03-081-7/+7
| * Construct test load iar only once and reuse for each test, rather than recrea...Justin Clark-Casey (justincc)2011-03-051-8/+18
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-271-1/+1
|\ \ | |/
| * change some log messages from info to debugJustin Clark-Casey (justincc)2011-02-251-1/+1
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-02-211-14/+50
|\ \
| * | throttle group notices to max of 4 threads at a timeMike Rieker2011-02-201-14/+50
* | | Prevent attaching things you don't own from inworld. Simple solution for aMelanie2011-02-211-0/+7
|/ /
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-191-42/+18
|\ \ | |/
| * Changed console command "alert" and added new command "alert-user".Marck2011-02-161-42/+18
* | Fix merge issuesMelanie2011-02-071-6/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-072-3/+11
|\ \ | |/
| * Addresses mantis #5360: CreatorData was being written as long as it wasn't nu...Diva Canto2011-02-031-0/+2
| * Comment out texture CAPS 'texture not found' message for nowJustin Clark-Casey (justincc)2011-02-021-3/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-291-2/+2
|\ \ | |/
| * minor: remove a few mono compiler warningsJustin Clark-Casey (justincc)2011-01-281-2/+2