Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-08 | 1 | -1/+4 | |
|\ | ||||||
| * | * Cache null account responses in the SimianUserAccountServiceConnector to ↵ | John Hurliman | 2010-09-07 | 1 | -1/+4 | |
| | | | | | | | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache | |||||
* | | If a scene object part UUID is changed (only possible when not in a scene), ↵ | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -1/+1 | |
|/ | | | | then adjust the inventory items to point to the new uuid as well | |||||
* | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -28/+29 | |
| | ||||||
* | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -26/+29 | |
| | | | | conditions in linking and unlinking | |||||
* | Revert "don't report the null uuid as a missing asset on saving oars/iars" | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -5/+3 | |
| | | | | | | | This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea. This change led to infinite timeout since the expected number of assets no longer matched requests. Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient | |||||
* | don't report the null uuid as a missing asset on saving oars/iars | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -3/+5 | |
| | ||||||
* | remove pointless mock user account service since the real one can now be ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -1/+1 | |
| | | | | easily configured for test purposes | |||||
* | refactor: move GetStream and URI methods from ArchiveReadRequest -> ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 2 | -63/+65 | |
| | | | | ArchiveHelpers | |||||
* | Fix a problem where SceneGraph.AddSceneObject() would return false on ↵ | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -1/+0 | |
| | | | | | | successfully adding an object rather than true, in defiance of its method documentation This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added. | |||||
* | make oar object filename/pathname creation a helper method | Justin Clark-Casey (justincc) | 2010-05-21 | 4 | -38/+75 | |
| | | | | | reused in both tests and oar code reduction in checking is outweighed by greater test clarity | |||||
* | add prim item and test asset save in save oar unit test | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -3/+31 | |
| | ||||||
* | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 1 | -0/+1 | |
| | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable. | |||||
* | 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 | |
| | | | | | This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker. This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation. | |||||
* | * UuidGatherer now tracks asset types for assets it discovers. The asset ↵ | John Hurliman | 2010-03-15 | 2 | -12/+25 | |
| | | | | | | types are inferred from context * OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file | |||||
* | 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 ↵ | Justin Clark-Casey (justincc) | 2010-02-26 | 1 | -0/+2 | |
| | | | | | | | | | | | | textures, etc.) were not being persisted to the database this meant that the loaded settings would disappear after a restart | |||||
* | | 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 ↵ | John Hurliman | 2010-02-22 | 3 | -15/+39 | |
|\ \ | | | | | | | | | | into presence-refactor | |||||
| * \ | Merge branch 'master' into presence-refactor | Melanie | 2010-02-22 | 3 | -14/+38 | |
| |\ \ | | |/ | | | | | | | This brings presence-refactor up to master again | |||||
| | * | forestall bug reports about the Command error: ↵ | Justin Clark-Casey (justincc) | 2010-02-19 | 2 | -2/+26 | |
| | | | | | | | | | | | | System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is | |||||
| | * | 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 ↵ | John Hurliman | 2010-02-22 | 2 | -2/+2 | |
|/ / | | | | | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it | |||||
* | | Merge branch 'master' into presence-refactor | Melanie | 2010-02-08 | 3 | -114/+219 | |
|\ \ | |/ | | | | | | | This was a large, heavily conflicted merge and things MAY have got broken. Please check! | |||||
| * | 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 | |
| | | | | | | | | Extend load oar test to check loading of a sound item | |||||
| * | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 1 | -1/+0 | |
| | | | | | | | | This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf. | |||||
| * | 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 | |
| | | | | | | | | | | | | Passes but not yet complete | |||||
| | * | 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 | |
| | | | | | | | | | | | | Write bare bones unit test for region setting loads | |||||
| * | | Updates all IRegionModules to the new style region modules. | Revolution | 2010-01-23 | 1 | -0/+1 | |
| |/ | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | |||||
* | | 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 | |
| | | | | | | | | | | appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process. | |||||
* | | * OMG! All but one references to UserProfileCacheService have been rerouted! | Diva Canto | 2010-01-10 | 1 | -2/+3 | |
|/ | | | | | * HG is seriously broken here * Compiles. Untested. | |||||
* | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 3 | -4/+4 | |
| | ||||||
* | remove stringent content type checking to make it easier to load oars ↵ | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -2/+5 | |
| | | | | directly from urls | |||||
* | 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 | |
| | | | | | | | An oar can now be merged with existing region contents by using the --merge option For example, load oar --merge my.oar Existing terrain, region settings and parcel data is left in place when an oar is merged. See http://opensimulator.org/wiki/OpenSim_Archives#Usage for more information | |||||
* | Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -1/+9 | |
| | | | | command line parsing | |||||
* | make save and load oar slightly more robust by always closing the archive ↵ | Justin Clark-Casey (justincc) | 2009-11-24 | 3 | -13/+30 | |
| | | | | streams even if there has been an error |