| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 3 | -65/+71 |
| |\ | |||||
| | * | Changed logging level for message about failure to retrieve a map image from ↵ | Marck | 2010-12-13 | 1 | -1/+1 |
| | | | | | | | | | a linked region. | ||||
| | * | Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. | Marck | 2010-12-13 | 3 | -64/+70 |
| | | | | | | | | | | | | | Configuration option AssetService in section [GridService] must be set to enable this functionality. Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 6 | -68/+53 |
| |\ \ | |/ | |||||
| | * | Adjust hypergrid console commands to latest changes. | Marck | 2010-12-10 | 1 | -64/+41 |
| | | | |||||
| | * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 |
| | | | |||||
| | * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 4 | -2/+8 |
| | | | | | | | | | command. mantis #5259 | ||||
| | * | Minor bug fixes. Hunting down mantis #5259 | Diva Canto | 2010-12-09 | 2 | -2/+4 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 2 | -0/+61 |
| | | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| | * | Removed extraneous left-/ on /object/ subpath. Bug introduced during region ↵ | Diva Canto | 2010-12-07 | 1 | -1/+1 |
| | | | | | | | | | URLs clean up. | ||||
| * | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 2 | -0/+61 |
| | | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 13 | -150/+154 |
| |\ \ | |/ | |||||
| | * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 5 | -23/+29 |
| | | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 6 | -42/+354 |
| | |\ | |||||
| | * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -1/+8 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 9 | -16/+538 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -3/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * \ \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 3 | -1/+45 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | * 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 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | 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 | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -23/+29 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 5 | -24/+142 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | | | | | | | | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 2 | -8/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add a missing interface memeber to the new HG stuff | Melanie | 2010-12-03 | 1 | -0/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 5 | -41/+352 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| | * | | | | | | | | | | | 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. | ||||
| | * | | | | | | | | | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-23 | 1 | -1/+8 |
| | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | | Make gatekeeper's address check case-insensitive. | Marck | 2010-11-28 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 8 | -8/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password. | ||||
| * | | | | | | | | | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-22 | 1 | -1/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 3 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | 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. | ||||
| * | | | | | | | | | | | 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. | ||||
| * | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-21 | 2 | -0/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | 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 |
| | |/ / / / / / / / / | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |