| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 3 | -28/+39 |
|\ |
|
| * | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 1 | -0/+1 |
| * | minor: use the static ascii and utf8 encodings instead of instantiating our own | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -6/+3 |
| * | Add --skip-assets option to load oar. | Justin Clark-Casey (justincc) | 2010-04-16 | 3 | -24/+37 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 2 | -12/+25 |
|\ \
| |/ |
|
| * | * UuidGatherer now tracks asset types for assets it discovers. The asset type... | John Hurliman | 2010-03-15 | 2 | -12/+25 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 4 | -34/+60 |
|\ \
| |/ |
|
| * | Merge branch 'master' into presence-refactor | Melanie | 2010-03-01 | 1 | -0/+2 |
| |\ |
|
| | * | fix bug where region settings loaded via an oar (water height, terrain textur... | Justin Clark-Casey (justincc) | 2010-02-26 | 1 | -0/+2 |
| * | | Changed asset CreatorID to a string | John Hurliman | 2010-02-22 | 2 | -2/+2 |
| * | | Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i... | John Hurliman | 2010-02-22 | 3 | -15/+39 |
| |\ \ |
|
| | * \ | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 3 | -14/+38 |
| | |\ \
| | | |/ |
|
| | | * | forestall bug reports about the Command error: System.EntryPointNotFoundExcep... | Justin Clark-Casey (justincc) | 2010-02-19 | 2 | -2/+26 |
| | | * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -12/+12 |
| | * | | One more test running. | Diva Canto | 2010-02-21 | 1 | -1/+1 |
| * | | | * Adds CreatorID to asset metadata. This is just the plumbing to support Crea... | John Hurliman | 2010-02-22 | 2 | -2/+2 |
| |/ / |
|
| * | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-08 | 3 | -114/+219 |
| |\ \
| | |/ |
|
| * | | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. | Diva Canto | 2010-01-11 | 2 | -2/+2 |
| * | | Remove all references to master avatar, replacing with estate owner where | Melanie | 2010-01-10 | 1 | -10/+6 |
| * | | * OMG! All but one references to UserProfileCacheService have been rerouted! | Diva Canto | 2010-01-10 | 1 | -2/+3 |
* | | | Merge branch 'master' into careminster | Melanie | 2010-02-02 | 1 | -127/+84 |
|\ \ \
| | |/
| |/| |
|
| * | | use common sop2 setup for TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -16/+12 |
| * | | make TestSaveOarV0_2() use a common part2 construction | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -18/+14 |
| * | | use common part1 createio nin TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -16/+5 |
| * | | minor: swap which part uses the automatically set up scene in TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -25/+13 |
| * | | use common part1 creation in ArchiverTests.TestLoadOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -30/+28 |
| * | | refactor out scene object 1 creation n ArchiverTetss | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -44/+22 |
| * | | factor out scene setup in ArchiverTests | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -40/+53 |
| * | | Add method to get all items with the same name from a particular prim | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -5/+4 |
| * | | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 1 | -1/+0 |
* | | | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 1 | -1/+0 |
* | | | Merge branch 'master' into careminster | Melanie | 2010-01-26 | 4 | -3/+152 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-01-23 | 3 | -3/+151 |
| |\ \ |
|
| | * | | Add first part of test for checking restore of task inventory items on oar load | Justin Clark-Casey (justincc) | 2010-01-22 | 2 | -1/+49 |
| | * | | complete assertion checks of all other oar loaded region settings | Justin Clark-Casey (justincc) | 2010-01-22 | 1 | -0/+28 |
| | * | | Allow oar loading to work even if an estate module is not present | Justin Clark-Casey (justincc) | 2010-01-22 | 2 | -2/+74 |
| | |/ |
|
| * | | Updates all IRegionModules to the new style region modules. | Revolution | 2010-01-23 | 1 | -0/+1 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 3 | -4/+4 |
|\ \
| |/ |
|
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 3 | -4/+4 |
* | | Merge branch 'master' into careminster | Melanie | 2009-11-28 | 1 | -2/+5 |
|\ \
| |/ |
|
| * | remove stringent content type checking to make it easier to load oars directl... | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -2/+5 |
* | | Merge branch 'master' into careminster | Melanie | 2009-11-25 | 2 | -3/+25 |
|\ \
| |/ |
|
| * | minor: add doc to a few parcel methods | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -0/+10 |
| * | Implement oar merging | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -6/+10 |
| * | Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid ... | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -1/+9 |
* | | Merge branch 'master' into careminster | Melanie | 2009-11-25 | 4 | -13/+67 |
|\ \
| |/ |
|
| * | make save and load oar slightly more robust by always closing the archive str... | Justin Clark-Casey (justincc) | 2009-11-24 | 3 | -13/+30 |
| * | pass all command parameters to load/save oar, not just the filename | Justin Clark-Casey (justincc) | 2009-11-24 | 1 | -0/+37 |
* | | Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lo... | CasperW | 2009-11-24 | 1 | -11/+10 |
|/ |
|
* | Changing the AssetBase constructors to avoid initializing assets with an unkn... | John Hurliman | 2009-11-05 | 2 | -4/+5 |