Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 4 | -8/+310 |
|\ | |||||
| * | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 2 | -7/+30 |
| | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | ||||
| * | Export the module interface for restart | Melanie | 2010-11-25 | 1 | -1/+2 |
| | | |||||
| * | Change all restarting to use the restart module. Remove hardcoded behavior | Melanie | 2010-11-25 | 1 | -1/+17 |
| | | |||||
| * | Finish the RestartModule and fix some bugs. Add new console commands: | Melanie | 2010-11-25 | 1 | -2/+60 |
| | | | | | | | | | | | | region restart bluebox <msg> <time> ... region restart notice <msg> <time> ... region restart abort [<message>] | ||||
| * | Implement the restart module | Melanie | 2010-11-25 | 1 | -2/+113 |
| | | |||||
| * | Adding the skeleton for the restart module | Melanie | 2010-11-24 | 1 | -0/+93 |
| | | |||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix: Allow use of parameters without specifying a file path with command ↵ | Marck | 2010-11-23 | 1 | -1/+1 |
| | | | | | | | | "save oar" | ||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 7 | -107/+179 |
|\ \ | |/ | |||||
| * | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 2 | -3/+8 |
| | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255). | ||||
| * | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 3 | -3/+27 |
| | | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule. | ||||
| * | Knock V0_2 decals off archive tests since they're misleading | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -8/+8 |
| | | |||||
| * | Fix unit tests and save problems | Justin Clark-Casey (justincc) | 2010-11-20 | 3 | -3/+4 |
| | | | | | | | | | | | | (note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly). Firstly, if you can save a version 1.0 OAR then you can load it too. Secondly, closing the save stream even on success before assets/objects are saved is a bad idea | ||||
| * | correct build break. for some reason, xbuild didn't rebuild test dlls | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -2/+2 |
| | | |||||
| * | Bump oar version to 1.0 from 0.5 | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -83/+119 |
| | | | | | | | | | | | | | | | | If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved Also closes save stream properly in the event of an error Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line e.g. save oar --version=0 oars/test.oar | ||||
| * | Fix gesture and viewer preview sounds not playing | Melanie | 2010-11-17 | 1 | -7/+13 |
| | | |||||
* | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 3 | -16/+18 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Remove a debug spam | Melanie | 2010-11-10 | 1 | -1/+0 |
| | | |||||
| * | Although the Allow Voice setting is per estate rather than per region, | Melanie | 2010-11-09 | 1 | -1/+3 |
| | | | | | | | | | | apparently it is required in the region handshake to let the client enable parcel voice controls. So, send it. | ||||
| * | Fix parcel bans to work only on the avatars they're supposed to work on ↵ | Melanie | 2010-11-09 | 1 | -14/+15 |
| | | | | | | | | instead of pushing all avatars, even the ones that are allowed. | ||||
* | | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 3 | -17/+44 |
|\ \ | |/ | |||||
| * | Fix playing sound from HUDs | Melanie | 2010-11-05 | 1 | -2/+16 |
| | | |||||
| * | Fix attached sounds from HUDs erroneously being delivered to other avatars | Melanie | 2010-11-05 | 1 | -0/+19 |
| | | |||||
| * | Old deserialization can't deal with commas in flag fields. Making use of ↵ | Diva Canto | 2010-11-02 | 2 | -16/+10 |
| | | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical. | ||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | * AbsolutePosition.Get{} returns incorrect result for child prim so switch ↵ | Teravus Ovares (Dan Olivares) | 2010-10-30 | 1 | -1/+1 |
| | | | | | | | | to using prim.GetWorldPosition() in the warp renderer. | ||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | for now, comment out some older or redundant log debug lines to make ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -1/+1 |
| | | | | | | | | diagnostics easier | ||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -43/+20 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-27 | 2 | -43/+20 |
| | | |||||
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+2 |
|/ | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
* | Merge remote branch 'otakup0pe/mantis5110' | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 7 | -60/+129 |
| | |\ | |||||
| | * \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 2 | -22/+52 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -3/+18 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -0/+6 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 9 | -47/+1413 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml | ||||
| * | | | | | | | slightly simplify oar control file loading code | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -10/+3 |
| | | | | | | | | |||||
| * | | | | | | | write IAR control file first in the archive rather than last | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Revert "* refactor refactor refactor ServerURI 4 lyfe" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98. | ||||
* | | | | | | | Revert "* additional serveruri cleanup" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9. | ||||
* | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml | ||||
* | | | | | | | slightly simplify oar control file loading code | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -10/+3 |
| | | | | | | |