aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-182-17/+49
|\
| * Fix bug where objects were being coalesced in the wrong positions.Justin Clark-Casey (justincc)2011-04-181-2/+2
| * Provide a configuration setting to control whether multiple taken objects are...Justin Clark-Casey (justincc)2011-04-182-15/+47
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-04-1730-99/+441
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-1730-99/+441
| |\ \ | | |/
| | * Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more tes...Diva Canto2011-04-152-25/+12
| | * refactor: separate out code that adds permissionsJustin Clark-Casey (justincc)2011-04-151-42/+59
| | * minor: remove a small amount of code duplicationJustin Clark-Casey (justincc)2011-04-151-4/+3
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-152-3/+21
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-145-11/+11
| | | |\
| | | * | Add ColladaMesh switchBlueWall2011-04-142-3/+21
| | * | | refactor: split out some rez code into a separate CreateItemForObject() methodJustin Clark-Casey (justincc)2011-04-151-143/+159
| | | |/ | | |/|
| | * | get rid of all traces of the now used mock service infrastructureJustin Clark-Casey (justincc)2011-04-155-11/+11
| | |/
| | * 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-154-26/+49
| | * 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
| | * simplify TestRezObject()Justin Clark-Casey (justincc)2011-04-141-17/+1
| | * Make scene object parts created by the test utils unit sized.Justin Clark-Casey (justincc)2011-04-141-3/+1
| | * simplify coalesced object tests by using existing scene object set up utilsJustin Clark-Casey (justincc)2011-04-141-34/+6
| | * Use common coalesced serialization code for both tests and the InventoryAcces...Justin Clark-Casey (justincc)2011-04-131-54/+13
| | * Adjust the quanterions used in the rez coalsced object tests to get sensible ...Justin Clark-Casey (justincc)2011-04-131-4/+12
| | * refactor: move code to obtain the coalescence size and object offsets into Co...Justin Clark-Casey (justincc)2011-04-131-1/+1
| | * Fix bug where rezzing coalesced objects would give all objects the same name ...Justin Clark-Casey (justincc)2011-04-132-7/+11
| | * Add coalesced scene objects class and serializer. This is currently only use...Justin Clark-Casey (justincc)2011-04-132-5/+93
| | * factor out some test code into the SetUp()Justin Clark-Casey (justincc)2011-04-131-14/+15
| | * Add a regression test for rezzing a single object into a scene from user inve...Justin Clark-Casey (justincc)2011-04-132-0/+137
| | * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-1211-12/+2
| | * Implemented terrain save-tile command. Does the opposite of load-tile. For no...Diva Canto2011-04-127-0/+132
| | * refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersectio...Justin Clark-Casey (justincc)2011-04-121-14/+1
| | * Fix (add) ability to rez objects by dragging them out of another prim's inven...Justin Clark-Casey (justincc)2011-04-121-0/+4
* | | Fix the cert validation handler so that it will not block other parts ofMelanie2011-04-171-2/+10
|/ /
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-121-7/+35
|\ \ | |/
| * minor: remove now inaccurate commentJustin Clark-Casey (justincc)2011-04-111-1/+1
| * minor: adjust some spacing and indentationJustin Clark-Casey (justincc)2011-04-111-10/+10
| * Implimented HTTP_VERIFY_CERT for llHttpRequestE. Allen Soard2011-04-111-3/+31
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-084-35/+130
|\ \ | |/
| * Signal prim count taint if the AbsolutePosition of a scene object changes.Justin Clark-Casey (justincc)2011-04-061-4/+26
| * Improve previous ILandObject method doc.Justin Clark-Casey (justincc)2011-04-063-49/+87
| * Add method doc to some land bitmap methods in ILandObject.Justin Clark-Casey (justincc)2011-04-062-18/+48
* | Add support for the new display name related functions in LSL. This does notMelanie2011-04-081-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-066-131/+204
|\ \ | |/
| * properly refresh object owner list when refresh button is hit on land parcel ...Justin Clark-Casey (justincc)2011-04-052-9/+14
| * remove now unused individual LandData prim counts.Justin Clark-Casey (justincc)2011-04-053-105/+27
| * If an object is selected, then don't include it in owner/group/others prim co...Justin Clark-Casey (justincc)2011-04-051-13/+18
| * Make the "All Estates" option work from the client (this makes chosen changes...Justin Clark-Casey (justincc)2011-04-052-7/+148
| * Implement rezzing coalesced objectsMelanie2011-04-031-11/+0
| * Implement rezzing coalesced objectsMelanie2011-04-031-105/+172
| * Implement taking of coalesced objects.Melanie2011-04-031-196/+263