aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-021-77/+0
|
* bad merge?UbitUmarov2015-09-011-1/+89
|\
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-291-4/+4
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * Intermediate commit. Sill errors.Melanie2014-01-051-1/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
| * | Merge branch 'master' into careminsterMelanie2013-09-071-0/+6
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Merge branch 'master' into careminsterMelanie2013-08-011-9/+9
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * \ \ Merge branch 'master' into careminsterMelanie2012-10-121-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2012-09-091-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2011-12-231-25/+56
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-181-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-061-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-301-68/+50
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-3/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-1/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-1/+3
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-3/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-201-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Fix Simian regressionMelanie2010-09-071-16/+19
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-14/+28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-13/+9
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-071-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-06-221-4/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-3/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵Tom Grimshaw2010-05-291-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.
* | | | | | | | | | | | | | | | | | OpenSimExtrasBlueWall2014-08-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.
* | | | | | | | | | | | | | | | | | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen).
* | | | | | | | | | | | | | | | | | varregion: many more updates removing the constant RegionSize and replacingRobert Adams2013-12-261-6/+6
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with a passed region size. This time in the map code and grid services code.
* | | | | | | | | | | | | | | | | Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-021-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.
* | | | | | | | | | | | | | | | A pretty major restructuring of the simian method invocations in order toMic Bowman2013-07-311-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.
* | | | | | | | | | | | | | | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵Justin Clark-Casey (justincc)2012-10-091-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.
* | | | | | | | | | | | | | 4096 is used in various places as the maximum height of a region, ↵SignpostMarv2012-09-081-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactoring to be a constant
* | | | | | | | | | | | | Enables processing of hypergrid links through simiangrid services. ThanksMic Bowman2011-12-221-25/+56
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otakup0pe
* | | | | | | | | | | | minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-01-181-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Reduce amount of debug lopgging put out by some simiangrid connectors. ↵Justin Clark-Casey (justincc)2011-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please re-enable if needed.
* | | | | | | | | | | | Moved the map tile processing used by the Simian GridMic Bowman2011-01-081-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.
* | | | | | | | | | | comment out a couple simian debug messagesMic Bowman2011-01-051-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Update SimianGridServicesConnector to work more likeMic Bowman2010-12-271-68/+50
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a connector so we can take advantage of the logic in RemoteGridServicesConnector.
* | | | | | | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-031-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Initial port of the Warp3D map tile rendererMelanie2010-10-031-1/+1
| | | | | | | | |
* | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-3/+1
|/ / / / / / / /
* | | | | | | | Fix Simian regressionMelanie2010-09-071-16/+19
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Add m_Enabled pattern to SimianGridConnectorMelanie2010-09-051-14/+28
| |_|_|_|_|/ |/| | | | |
* | | | | | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors ↵John Hurliman2010-09-031-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)
* | | | | Added Check4096 config var under [GridService], at the request of many. ↵Diva Canto2010-08-061-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 ↵Marck2010-08-061-0/+6
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service.
* | | | * Fixed SimianGrid map tile uploads not having any objects in the imagesJohn Hurliman2010-06-221-4/+28
| |_|/ |/| |
* | | Some people don't use Simian. Make the connector respect that it's disabledMelanie2010-06-121-1/+1
| |/ |/| | | | | and not try to send a map tile in that case.