| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -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-09 | 1 | -0/+13 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -1/+8 |
| |\ \ | |/ | |||||
| | * | Next step for world map overlays | Melanie | 2012-01-30 | 1 | -1/+8 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -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-19 | 1 | -4/+17 |
| | | | | | | | | | (e.g. 1000, 1000) rather than meter positions (256000, 256000) | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -0/+6 |
| |\ \ | |/ | |||||
| | * | Change GridService.GetRegionByName() to only return info if there is an ↵ | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -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-refactor | Melanie | 2010-12-06 | 1 | -2/+15 |
| |\ \ | |/ | |||||
| | * | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -1/+28 |
| | |\ | |||||
| * | \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -1/+28 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | 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. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -15/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -15/+2 |
| | |/ | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 1 | -1/+8 |
| | | | |||||
| | * | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -1/+7 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -2/+15 |
| |\ \ | |||||
| | * | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 1 | -1/+8 |
| | | | | |||||
| | * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -1/+7 |
| | |/ | |||||
| * | | Get maturity level from access number. This addresses mantis #269 | meta7 | 2010-08-20 | 1 | -0/+6 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Allow creation of link regions if there is an existing region within a 4096 ↵ | Marck | 2010-08-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | range. Also add GetHyperlinks() to the grid service. | ||||
| * | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵ | Tom Grimshaw | 2010-05-29 | 1 | -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 Hurliman | 2010-02-23 | 1 | -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 setter | John Hurliman | 2010-02-22 | 1 | -2/+0 |
| | | |||||
| * | Fixed a missing field in the last regions table migration. | Diva Canto | 2010-01-16 | 1 | -3/+3 |
| | | |||||
| * | Moved prim crossing to EntityTransferModule. Not complete yet. | Diva Canto | 2010-01-16 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' into presence-refactor | Melanie | 2010-01-16 | 1 | -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 URM | Melanie | 2010-01-13 | 1 | -1/+1 |
| | | | | | | | | | | | and region. The non-error case should be compatible, so no version bump. Untested. | ||||
| * | | Implement region registration with authentication | Melanie | 2010-01-15 | 1 | -0/+5 |
| | | | |||||
| * | | Remove all references to master avatar, replacing with estate owner where | Melanie | 2010-01-10 | 1 | -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 mechanism | Melanie | 2010-01-09 | 1 | -0/+4 |
| |/ | |||||
| * | Set the estate owner to be the master avatar if it's not set. | Melanie | 2009-10-14 | 1 | -0/+6 |
| | | |||||
| * | Add owner_uuid. Not sure this works. Worth a test | Melanie | 2009-10-07 | 1 | -0/+14 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -1/+1 |
| | | |||||
| * | Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB ↵ | Diva Canto | 2009-09-28 | 1 | -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 Canto | 2009-09-26 | 1 | -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 Canto | 2009-09-26 | 1 | -6/+21 |
| | | | | | minimally. A few bugs to catch now. | ||||
| * | Better guards on RegisterRegion in GridService. | Diva Canto | 2009-09-25 | 1 | -1/+9 |
| | | | | | Added serverPort to the fields that get stored (I think this is the UDP port). | ||||
| * | All tests pass for MySQL/MySQLRegionData. | Diva Canto | 2009-09-24 | 1 | -43/+18 |
| | | | | | Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient. | ||||
| * | GridServerPostHandler finished. GridClient tests all work. More guards on ↵ | Diva Canto | 2009-09-24 | 1 | -0/+4 |
| | | | | | getting parameters and replies over the wire. | ||||
| * | Added test GridClient, which allowed me to remove a few bugs out of the new ↵ | Diva Canto | 2009-09-24 | 1 | -0/+9 |
| | | | | | code. | ||||
| * | Changed IGridService to use the new GridRegion data structure instead of old ↵ | Diva Canto | 2009-09-23 | 1 | -9/+240 |
| | | | | | | | SimpleRegionInfo. Added grid configs to standalones. | ||||
| * | Added grid handler and grid remote connector. | Diva Canto | 2009-09-21 | 1 | -1/+1 |
| | | |||||
| * | First pass at the grid service. | Diva Canto | 2009-09-18 | 1 | -6/+11 |
| | | |||||
| * | Changed GetRegionByHandle to GetRegionByPosition -- more generic. | Diva Canto | 2009-09-11 | 1 | -1/+1 |
| | | |||||
| * | Added GetRegionByHandle. | Diva Canto | 2009-09-11 | 1 | -0/+2 |
| | | |||||
| * | Removed RequestLandData from IGridService because it's already in another place. | Diva Canto | 2009-09-11 | 1 | -4/+0 |
| | | | | | Moved GetMapBlocks to a new interface IMapService. | ||||
| * | Changed names of methods in IGridService. | Diva Canto | 2009-09-11 | 1 | -8/+13 |
| | | |||||
| * | Adding the new grid services skeleton. Still very much based on the old | Melanie Thielker | 2009-07-10 | 1 | -0/+83 |
| one but alowing multi-tenancy. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |