Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Added some comments. Better than listening to the boring speaker... | Diva Canto | 2010-12-01 | 2 | -0/+12 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 1 | -1/+2 | |
| |\ | ||||||
| | * | Make gatekeeper's address check case-insensitive. | Marck | 2010-11-27 | 1 | -1/+2 | |
| | | | ||||||
| * | | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 2 | -42/+107 | |
| | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | |||||
| * | | Creator information preserved upon HG transfers. | Diva Canto | 2010-11-26 | 1 | -1/+0 | |
| | | | ||||||
| * | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 4 | -41/+276 | |
| |/ | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | |||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -1/+8 | |
|\ \ | |/ | ||||||
| * | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-23 | 1 | -1/+8 | |
| | | ||||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 9 | -16/+538 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-22 | 3 | -2/+7 | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-21 | 4 | -4/+499 | |
| | |\ | ||||||
| | * | | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 3 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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). | |||||
| * | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵ | Melanie | 2010-11-22 | 1 | -2/+3 | |
| | |/ | |/| | | | | | | | why standalone should not. | |||||
| * | | Add the remote connector for freeswitch config retrieval | Melanie | 2010-11-21 | 1 | -0/+103 | |
| | | | ||||||
| * | | Remove username and password from the publicly accessible FS config | Melanie | 2010-11-21 | 1 | -3/+1 | |
| | | | ||||||
| * | | Implement a method to allow regions to query the gridwide Freeswitch | Melanie | 2010-11-21 | 2 | -0/+21 | |
| | | | | | | | | | | | | configuration from ROBUST | |||||
| * | | Move Dialplan and Directory from the region module to the ROBUST server | Melanie | 2010-11-21 | 1 | -4/+333 | |
| | | | ||||||
| * | | Start implementing Freeswitch in ROBUST | Melanie | 2010-11-21 | 3 | -4/+48 | |
| |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -0/+1 | |
| |\ | ||||||
| | * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | |||||
| * | | Do not include hyperlinks in a random region search during a login. | Marck | 2010-11-13 | 1 | -10/+30 | |
| |/ | | | | | | | Before a random region is chosen, available fallback regions are used for the login. | |||||
* | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -3/+3 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 1 | -3/+3 | |
| | | ||||||
* | | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 3 | -1/+45 | |
|\ \ | |/ | ||||||
| * | Delete existing presences for a user ID when they log in again. | Melanie | 2010-11-05 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | WARNING!!! This changes a default. The old default is to allow multiple presences, the new default disables this. As the feature currently has no users, this should not present any difficulty and will alleviate the presence issues somewhat. | |||||
| * | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 1 | -0/+4 | |
| | | | | | | | | from a region and allow normal day cycles to be reestablished | |||||
| * | Fix HypergridLinker.Check4096() | Marck | 2010-11-01 | 1 | -1/+28 | |
| | | | | | | | | Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects. | |||||
* | | * better semantics for link-region command | Jonathan Freedman | 2010-10-30 | 1 | -21/+21 | |
| | | | | | | | | * actually parse name for new link-region command | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -28/+80 | |
|\ \ | |/ | ||||||
| * | Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight. | Diva Canto | 2010-10-30 | 1 | -0/+3 | |
| | | ||||||
| * | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 1 | -28/+77 | |
| | | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2. | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 4 | -112/+153 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||||
| * | This commit fixes all the appearance related null refs. Still can't log in, | Melanie | 2010-10-30 | 2 | -56/+72 | |
| | | | | | | | | client displays a blank error box. | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 2 | -29/+29 | |
| |\ | ||||||
| | * | Change level of some logging messages, turning some info into arguably more ↵ | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -28/+28 | |
| | | | | | | | | | | | | appropriate debug to reduce console spam when log level is info | |||||
| * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 2 | -80/+105 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned. | |||||
* | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -1/+1 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 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 commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 1 | -11/+5 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 5 | -13/+137 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 5 | -13/+137 | |
| | |\ \ | | | | | | | | | | | | | | | | dev-appearance | |||||
| | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
| | * | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 3 | -15/+13 | |
| | | | | | ||||||
| | * | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 5 | -49/+15 | |
| | | | | | ||||||
| | * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 9 | -66/+51 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -23/+29 | |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs | |||||
| * | | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵ | Marck | 2010-10-28 | 1 | -20/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096. | |||||
| * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 12 | -132/+131 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
* | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 5 | -24/+142 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs |