aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces/IGridService.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* bug fixUbitUmarov2014-10-261-1/+1
|
* Merge branch 'avination-current'Melanie Thielker2014-08-231-0/+6
|\
| * Fix a null ref that will cause an exception if a grid region doesnt' specify ↵Melanie Thielker2014-08-231-0/+6
| | | | | | | | a URI.
* | Intermediate commit. Sill errors.Melanie2014-01-051-0/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Remove some chatty DebugFormat statements. No functional changes.Robert Adams2014-01-041-2/+2
| | |
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Initialize default region size in GridRegion in the no parameter constructorRobert Adams2013-12-281-0/+2
| | | | | | | | | | | | as is used by the grid connector tests.
| * | Add serialization/deserialization of region size to RegionInfo, GridRegion, ↵Robert Adams2013-12-281-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | and RegionData. This does not modify interfaces or handling of variable sized regions. This only enables the loading and storing of the region size and the reporting of the region size in grid service responses. The database tables already have the code to load and store the region size.
* | | Merge branch 'master' into careminsterMelanie2013-09-071-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | 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-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 careminsterMelanie2013-09-011-1/+4
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Do not add a port zero to end of the hypergrid gateway host name.Robert Adams2013-08-281-1/+4
| | | | | | | | | | | | If the port is specified it is added but a ":0" is not added if the port is zero. This enables the hypergrid address short form "hypergridGateway:regionName" which is handled by the parser but failed because of this zero port addition.
* | Merge branch 'master' into careminsterMelanie2012-10-121-0/+13
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: Add documentation to IGridService.GetRegionFlags()Justin Clark-Casey (justincc)2012-10-091-0/+13
| |
* | Merge branch 'master' into careminsterMelanie2012-01-301-1/+8
|\ \ | |/
| * Next step for world map overlaysMelanie2012-01-301-1/+8
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-191-4/+17
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Improve some grid region log messages to express regions at co-ordinate ↵Justin Clark-Casey (justincc)2011-11-191-4/+17
| | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000)
* | Resolve merge commits, stage 1Tom2011-09-041-0/+6
|\ \ | |/
| * Change GridService.GetRegionByName() to only return info if there is an ↵Justin Clark-Casey (justincc)2011-08-021-0/+6
| | | | | | | | | | | | | | exact region name match, unlike GetRegionsByName() This should fix the first part of http://opensimulator.org/mantis/view.php?id=5606, and maybe 5605. Thanks to Melanie for helping with this.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-2/+15
|\ \ | |/
| * Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-1/+28
| |\
* | \ Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-1/+28
|\ \ \ | | |/ | |/|
| * | Fix HypergridLinker.Check4096()Marck2010-11-011-1/+28
| | | | | | | | | | | | Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-15/+2
|\ \ \ | |/ /
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-15/+2
| |/ | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * * more url / hg cleanupJonathan Freedman2010-10-111-1/+8
| |
| * * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-1/+7
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-2/+15
|\ \
| * | * more url / hg cleanupJonathan Freedman2010-10-201-1/+8
| | |
| * | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-201-1/+7
| |/
* | Get maturity level from access number. This addresses mantis #269meta72010-08-201-0/+6
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-071-0/+1
|\ \ | |/
| * Allow creation of link regions if there is an existing region within a 4096 ↵Marck2010-08-061-0/+1
| | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service.
* | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵Tom Grimshaw2010-05-291-2/+6
|/ | | | 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.
* * Removed the unused GridRegion.getInternalEndPointPort() (just use ↵John Hurliman2010-02-231-5/+0
| | | | | | | InternalEndPoint.Port). This class is complex enough as it is * Changed the failed to inform neighbor message from a warning to info, since this will fire for every empty neighbor space * Made the EnableSimulator/EstablishAgentCommunication log message more verbose and more clear about what is happening
* * Removed the broken and unused GridRegion.ExternalEndPoint setterJohn Hurliman2010-02-221-2/+0
|
* Fixed a missing field in the last regions table migration.Diva Canto2010-01-161-3/+3
|
* Moved prim crossing to EntityTransferModule. Not complete yet.Diva Canto2010-01-161-2/+2
|
* Merge branch 'master' into presence-refactorMelanie2010-01-161-1/+1
|\ | | | | | | | | This merge was very conflicted. I think I got them all, but I can't be sure. I had to merge to master or risk divergence to the point of unmergeability.
| * Change the error messages on region region registration. This changes URMMelanie2010-01-131-1/+1
| | | | | | | | | | and region. The non-error case should be compatible, so no version bump. Untested.
* | Implement region registration with authenticationMelanie2010-01-151-0/+5
| |
* | Remove all references to master avatar, replacing with estate owner whereMelanie2010-01-101-6/+0
| | | | | | | | | | appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process.
* | Preliminary work on the new default region setting mechanismMelanie2010-01-091-0/+4
|/
* Set the estate owner to be the master avatar if it's not set.Melanie2009-10-141-0/+6
|
* Add owner_uuid. Not sure this works. Worth a testMelanie2009-10-071-0/+14
|
* Formatting cleanup.Jeff Ames2009-10-011-1/+1
|
* Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB ↵Diva Canto2009-09-281-5/+9
| | | | layer. This sounds fishy to me, but it's what's used to make external currency modules work, for now.
* Moved all HG1 operations to HGGridConnector.cs and ↵Diva Canto2009-09-261-0/+14
| | | | | | HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo. Fixed small bugs with hyperlinked regions' map positions.
* First pass at the heart surgery for grid services. Compiles and runs ↵Diva Canto2009-09-261-6/+21
| | | | minimally. A few bugs to catch now.