aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-05-2710-73/+321
|\
| * improve help information for "appearance show"Justin Clark-Casey (justincc)2011-05-261-2/+3
| | | | | | | | at the moment, this just performs a baked avatar check for everybody in the region. If the check returns 'corrupt' then a baked texture is missing and other avatars will continue to see the gas ball.
| * Add --noassets option for "save iar"Justin Clark-Casey (justincc)2011-05-264-19/+146
| | | | | | | | | | | | | | | | Like "save oar", this saves an iar without assets This can be useful for backup when you know the required assets will still be present (e.g. you're backing up the assets db separately). This also bumps the iar format version to 0.3 and 1.2 respectively. 0.3 is backward compatible with previous opensim versions 1.2 is used if the --profile switch is specified. It is only compatible with 0.7.1 presently.
| * Bump OAR file format version up to 0.7 for this development cycle.Justin Clark-Casey (justincc)2011-05-261-2/+2
| | | | | | | | | | This adds a <assets_included>true|false</assets_included> element to the oar control file, though this is not used on reloading at this time. This addition is backward compatible with previous opensim releases
| * fix bug where outfit folder links could not be deletedJustin Clark-Casey (justincc)2011-05-261-4/+4
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-05-262-6/+40
| |\
| * | Add a --noassets option to "save oar".Justin Clark-Casey (justincc)2011-05-265-47/+167
| | | | | | | | | | | | | | | This switch stops any assets being saved in the oar. This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available.
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-05-273-8/+28
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ Merge branch 'careminster-presence-refactor' of ↵Melanie2011-05-262-7/+27
| |\ \ \ | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| | * \ \ Merge branch 'careminster-presence-refactor' of ↵Tom2011-05-2657-213/+674
| | |\ \ \ | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| | * | | | Some additional protection, it seems that responsedata needs to be locked, ↵Tom2011-05-262-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
| * | | | | Change setter on changed flags to public so modules can reset itMelanie2011-05-261-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-250-0/+0
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Add PayPrice to serialization format Xml2Melanie2011-05-252-6/+40
| | |/ | |/|
| * | Revert "Make client event handlers for money only work on root agents"BlueWall2011-05-241-30/+6
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a8913141c081202eb1f988901a4ac0988bbd72a2. Pulling this back until some testing under various money modules can be done. Need to be able to make purchases as a child agent.
| * | Make client event handlers for money only work on root agentsBlueWall2011-05-241-6/+30
| | |
* | | Add PayPrice to serialization format Xml2Melanie2011-05-252-2/+36
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-240-0/+0
|\ \ \ | |/ /
| * | Allow disabling the legacy backup mechanism to avoid the object clone ifMelanie2011-05-242-1/+10
| | | | | | | | | | | | backup is not used.
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-05-242-1/+10
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Allow disabling the legacy backup mechanism to avoid the object clone ifMelanie2011-05-242-1/+10
| | | | | | | | | | | | | | | | backup is not used.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-240-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Create a method to force the script engine to save state from outsideMelanie2011-05-242-4/+11
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-240-0/+0
|\ \ \ | |/ /
| * | Add an event for an orderly region shutdown that fires once per region beforeMelanie2011-05-242-0/+27
| | | | | | | | | | | | the SceneGraph is torn down.
* | | Create a method to force the script engine to save state from outsideMelanie2011-05-242-4/+11
| | |
* | | Add an event for an orderly region shutdown that fires once per region beforeMelanie2011-05-242-0/+27
| | | | | | | | | | | | the SceneGraph is torn down.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-231-1/+0
|\ \ \ | |/ /
| * | Fix Mantis #4429: Allow llGiveInventory to work across sim borders.Melanie2011-05-231-9/+23
| | |
* | | Implement llGodLikeRezObject and llGetUsedMemoryMelanie2011-05-224-4/+61
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-05-2237-144/+331
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-05-2237-144/+331
| |\ \ \ | | |/ /
| | * | Add stubs for unimplemented lsl functionsBlueWall2011-05-221-18/+67
| | | |
| | * | Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just ↵Justin Clark-Casey (justincc)2011-05-2130-30/+4
| | | | | | | | | | | | | | | | OpenSim.Tests.Common instead
| | * | rename test helpers enclosing package from Setup to HelpersJustin Clark-Casey (justincc)2011-05-216-0/+0
| | | |
| | * | rename UserInventoryTestsUtils -> UserInventoryHelpers for consistencyJustin Clark-Casey (justincc)2011-05-212-6/+6
| | | |
| | * | test helper rename for consistencyJustin Clark-Casey (justincc)2011-05-211-1/+1
| | | |
| | * | refactor: rename AddSceneObjectItem to AddSceneObjectJustin Clark-Casey (justincc)2011-05-212-2/+2
| | | |
| | * | refactor: move scene object item creation code into TaskInventoryHelpersJustin Clark-Casey (justincc)2011-05-212-9/+24
| | | |
| | * | move test task inventory notecard item creation into a new ↵Justin Clark-Casey (justincc)2011-05-212-21/+70
| | | | | | | | | | | | | | | | TastInventoryHelpers class
| | * | refactor: use SceneSetupHelpers.CreateSceneObject()Justin Clark-Casey (justincc)2011-05-211-13/+3
| | | |
| | * | rename UserProfileTestUtils to UserAccountHelpers to be consistent with ↵Justin Clark-Casey (justincc)2011-05-216-20/+20
| | | | | | | | | | | | | | | | other test helper names
| | * | refactor: in TaskInventoryTests, use ↵Justin Clark-Casey (justincc)2011-05-211-12/+3
| | | | | | | | | | | | | | | | UserProfileTestUtils.CreateUserWithInvetory()
| | * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-05-211-3/+3
| | | |
| | * | refactor Scene.RezObject() to use AddNewSceneObject() rather than ↵Justin Clark-Casey (justincc)2011-05-214-25/+17
| | | | | | | | | | | | | | | | copy/pasting code with small differences
| | * | refactor TestRezObjectFromInventoryItem()Justin Clark-Casey (justincc)2011-05-201-6/+6
| | | |
| | * | implement Scene.GetSceneObjectGroup(string name) to match the equivalent ↵Justin Clark-Casey (justincc)2011-05-202-3/+43
| | | | | | | | | | | | | | | | GetSOP method
| | * | implement Scene.GetSceneObjectGroup(UUID fullID) using existing indexJustin Clark-Casey (justincc)2011-05-202-0/+26
| | | |
| | * | add test for rezzing an object from a prim itemJustin Clark-Casey (justincc)2011-05-204-5/+66
| | | |
* | | | Add a missing virtual keywordMelanie2011-05-201-1/+1
| | | |