| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2013-09-07 | 1 | -0/+6 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵ | Justin Clark-Casey (justincc) | 2013-09-02 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | allow different default regions for HG and direct grid logins. This requires a new GridService.GetDefaultHypergridRegions() so ROBUST services require updating but not simulators. This method still returns regions flagged with just DefaultRegion after any DefaultHGRegions, so if no DefaultHGRegions are specified then existing configured defaults will still work. Immediate use is for conference where we need to be able to specify different defaults However, this is also generally useful to send experienced HG users to one default location and local users whose specified region fails (e.g. no "home" or "last") to another. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-08-01 | 1 | -9/+9 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | ||||
| | * | A pretty major restructuring of the simian method invocations in order to | Mic Bowman | 2013-07-31 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | service access capabilities. In conjunction with the corresponding Simian updates, this enables explicit per-simulator capability-based access to grid services. That enables grid owners to add or revoke access to the grid on a simulator by simulator basis. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵ | Justin Clark-Casey (justincc) | 2012-10-09 | 1 | -2/+2 |
| | | | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 1 | -2/+2 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | 4096 is used in various places as the maximum height of a region, ↵ | SignpostMarv | 2012-09-08 | 1 | -2/+2 |
| | | | | | | | | | refactoring to be a constant | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-23 | 1 | -25/+56 |
| |\ \ | |/ | |||||
| | * | Enables processing of hypergrid links through simiangrid services. Thanks | Mic Bowman | 2011-12-22 | 1 | -25/+56 |
| | | | | | | | | | otakup0pe | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 1 | -3/+3 |
| |\ \ | |/ | |||||
| | * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 1 | -2/+2 |
| | | | |||||
| | * | Reduce amount of debug lopgging put out by some simiangrid connectors. ↵ | Justin Clark-Casey (justincc) | 2011-01-18 | 1 | -1/+1 |
| | | | | | | | | | Please re-enable if needed. | ||||
| | * | Moved the map tile processing used by the Simian Grid | Mic Bowman | 2011-01-08 | 1 | -86/+0 |
| | | | | | | | | | | | | | Frontend into a separate region module. Configuration settings added to the defaults ini file. Others may find this useful for pushing map tiles to a separate server. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | comment out a couple simian debug messages | Mic Bowman | 2011-01-05 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 1 | -68/+50 |
| |\ \ | |/ | |||||
| | * | Update SimianGridServicesConnector to work more like | Mic Bowman | 2010-12-27 | 1 | -68/+50 |
| | | | | | | | | | | | a connector so we can take advantage of the logic in RemoteGridServicesConnector. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -3/+1 |
| |\ \ | |/ | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -1/+3 |
| |\ \ | |||||
| | * | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+3 |
| | |/ | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 |
| | |\ | |||||
| | * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -3/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -3/+1 |
| |\ \ \ | |||||
| | * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -3/+1 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 1 | -1/+1 |
| | |/ | |||||
| | * | Fix Simian regression | Melanie | 2010-09-07 | 1 | -16/+19 |
| | | | |||||
| * | | Fix Simian regression | Melanie | 2010-09-07 | 1 | -16/+19 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -14/+28 |
| |\ \ | |/ | |||||
| | * | Add m_Enabled pattern to SimianGridConnector | Melanie | 2010-09-05 | 1 | -14/+28 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -13/+9 |
| |\ \ | |/ | |||||
| | * | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors ↵ | John Hurliman | 2010-09-03 | 1 | -13/+9 |
| | | | | | | | | | | | | | to handle initialization as graceful as possible with the current broken way region module initialization is done * Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side) | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -0/+6 |
| |\ \ | |/ | |||||
| | * | Added Check4096 config var under [GridService], at the request of many. ↵ | Diva Canto | 2010-08-06 | 1 | -5/+5 |
| | | | | | | | | | | | | | Changed the iteration that Marck had on the Hyperlinker. ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example. | ||||
| | * | Allow creation of link regions if there is an existing region within a 4096 ↵ | Marck | 2010-08-06 | 1 | -0/+6 |
| | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-22 | 1 | -4/+28 |
| |\ \ | |/ | |||||
| | * | * Fixed SimianGrid map tile uploads not having any objects in the images | John Hurliman | 2010-06-22 | 1 | -4/+28 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Some people don't use Simian. Make the connector respect that it's disabled | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | | | | | | | | and not try to send a map tile in that case. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -3/+81 |
| |\ \ | |/ | |||||
| | * | * Added a new method to IMapImageGenerator for getting the map tile before ↵ | John Hurliman | 2010-06-11 | 1 | -3/+81 |
| | | | | | | | | | | | | | | | it is JPEG2000 compressed * Aesthetically improved map tile water * SimianGrid connector now uploads a PNG tile to the AddMapTile API | ||||
| * | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵ | Tom Grimshaw | 2010-05-29 | 1 | -1/+3 |
| |/ | | | | be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad. | ||||
| * | Change the SimianGrid connector log messages to start with "[SIMIAN " to ↵ | John Hurliman | 2010-03-26 | 1 | -9/+9 |
| | | | | | avoid configuration confusion | ||||
| * | Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors | John Hurliman | 2010-03-15 | 1 | -1/+1 |
| | | |||||
| * | * Added a better check to the SimianGrid connectors to test if they are ↵ | John Hurliman | 2010-03-12 | 1 | -12/+15 |
| | | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET | ||||
| * | Fixing the previous patch to work correctly with standalone mode | John Hurliman | 2010-03-12 | 1 | -4/+4 |
| | | |||||
| * | Fixed SimianGrid connectors to gracefully exit if the required config ↵ | John Hurliman | 2010-03-12 | 1 | -5/+5 |
| | | | | | sections are missing | ||||
| * | Simplify database setup and remove migration problems by moving all sqlite ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 1 | -1/+1 |
| | | | | | | | | | | config-include settings to a separate file for standalone Update information in StandaloneCommon.ini.example to reflect this Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.). Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations | ||||
| * | Adding the SimianGrid connectors | John Hurliman | 2010-03-11 | 1 | -0/+418 |
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |