aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of /home/opensim/lib/develop/BlueWallBlueWall2011-04-151-1/+34
|\
| * Thanks Snoopy for a patch that allows setting of perms on items given to new ↵BlueWall2011-04-151-1/+34
| | | | | | | | avatars
| * Add ColladaMesh switchBlueWall2011-04-133-4/+26
| |
| * Merge branch 'master' of /home/git/repo/OpenSimBlueWall2011-04-13154-7522/+3275
| |\
| * \ Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-03-2197-1508/+2109
| |\ \
| * \ \ Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-02-142-14/+8
| |\ \ \
| * | | | Set filter to send proper rotations for root partBlueWall2011-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the root prim, alone or in a set, to send it's rotation. This fixes unsitting the avatar on sit-offsest type teleports where the sit target is in the root prim of a linkset.
| * | | | Revert "Fix unsitting of avatar on linked sets"BlueWall2011-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit b492f1ce99d27bcf29eb5805564c8778aa4df748.
| * | | | Fix unsitting of avatar on linked setsBlueWall2011-02-121-1/+1
| | | | |
| * | | | Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-02-1259-2164/+1164
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-02-0931-163/+1037
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of /home/opensim/src/OpenSim/CoreBlueWall2011-01-2760-699/+898
| |\ \ \ \ \ \
| * | | | | | | Make FireAndForgetWrapper a singleton classBlueWall2011-01-133-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made FireAndForgetWrapper a singleton class to allow us to drop dependancy on the BclExtras35 library. BclExtras is broken in Mono 2.8.2 and we used the library in only one function.
* | | | | | | | 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-153-4/+26
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-04-148-53/+20
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add ColladaMesh switchBlueWall2011-04-143-4/+26
| | | | | | | | | |
* | | | | | | | | | 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-158-45/+17
| | | | | | | | |
* | | | | | | | | remove old code for a mock grid service, which got removed some time backJustin Clark-Casey (justincc)2011-04-151-8/+3
|/ / / / / / / /
* | | | | | | | remove any reference to a mock authentication service since it doesn't exist ↵Justin Clark-Casey (justincc)2011-04-151-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and we don't use it
* | | | | | | | remove mock asset service for tests in favour of always using the real oneJustin Clark-Casey (justincc)2011-04-153-133/+8
| | | | | | | |
* | | | | | | | Remove the mock inventory service for tests and just use the real one all ↵Justin Clark-Casey (justincc)2011-04-152-199/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the time with an in-memory data plugin
* | | | | | | | 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 ↵Justin Clark-Casey (justincc)2011-04-1510-39/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.Justin Clark-Casey (justincc)2011-04-143-6/+64
| | | | | | | |
* | | | | | | | 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-142-5/+3
| | | | | | | |
* | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-141-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Comment out the warning if the prioritizer runs without a fullyMic Bowman2011-04-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized scene presence. Not sure why we are dumping updates to a client that isn't there yet...
* | | | | | | | | simplify coalesced object tests by using existing scene object set up utilsJustin Clark-Casey (justincc)2011-04-142-41/+20
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | this change makes it possible to set an absolute position on a group before it is put into a scene.
* | | | | | | | Use common coalesced serialization code for both tests and the ↵Justin Clark-Casey (justincc)2011-04-131-54/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InventoryAccessModule. Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
* | | | | | | | Adjust the quanterions used in the rez coalsced object tests to get sensible ↵Justin Clark-Casey (justincc)2011-04-133-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bounding box and offset numbers. Extend test to check position of objects in the rezzed coalescence.
* | | | | | | | refactor: move code to obtain the coalescence size and object offsets into ↵Justin Clark-Casey (justincc)2011-04-133-16/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CoalescedSceneObjects from the serializer.
* | | | | | | | Fix bug where rezzing coalesced objects would give all objects the same name ↵Justin Clark-Casey (justincc)2011-04-132-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the item. This now only happens for the first object (which was the item selected last when the coalesce was originally taken) This matches the expected behaviour of the environment as seen on the Linden Labs grid.
* | | | | | | | Add coalesced scene objects class and serializer. This is currently only ↵Justin Clark-Casey (justincc)2011-04-138-9/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used by the TestRezCoalescedObject() regression test. This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc. Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item. Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place. This bug will be addressed shortly.
* | | | | | | | 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 ↵Justin Clark-Casey (justincc)2011-04-134-1/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inventory
* | | | | | | | force mesh proxy for simple box prims with path cutdahlia2011-04-122-0/+6
| | | | | | | |
* | | | | | | | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵Diva Canto2011-04-1230-472/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Implemented terrain save-tile command. Does the opposite of load-tile. For ↵Diva Canto2011-04-127-0/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now, only saves to .png.
* | | | | | | | Bug fix in object serialization -- sculpt data was wrong.Diva Canto2011-04-121-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Move example HttpProxy setting to OpenSim.ini.example and tidyJustin Clark-Casey (justincc)2011-04-122-9/+8
| | | | | | |
* | | | | | | minor typo correction. thanks Ai Austin.Justin Clark-Casey (justincc)2011-04-121-1/+1
| | | | | | |
* | | | | | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-04-121-3/+3
| | | | | | |
* | | | | | | refactor: simplify bRayEndIsIntersection boolean set from ↵Justin Clark-Casey (justincc)2011-04-122-26/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | RayEndIsIntersection byte
* | | | | | | If an object is rezzed directly from a prim inventory then give it the ↵Justin Clark-Casey (justincc)2011-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rotation it was stored with.
* | | | | | | Allow a null rotation to be passed in to RezObject so that we can control ↵Justin Clark-Casey (justincc)2011-04-121-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | whether to use the serialized rotation or not. Not used yet.