| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
OpenSim/Framework/Constants.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Services/GridService/GridService.cs
OpenSim/Services/Interfaces/IGridService.cs
Most conflicts had to do with Util routines not in master branch yet.
|
| |
| |
| |
| | |
as is used by the grid connector tests.
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| |
| | |
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).
|
| |
| |
| |
| | |
with a passed region size. This time in the map code and grid services code.
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
|
| |
| |
| |
| |
| |
| | |
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
|
| |
| |
| |
| |
| |
| |
| | |
Routines in Util to compute region world coordinates from region coordinates
as well as the conversion to and from region handles. These routines have
replaced a lot of math scattered throughout the simulator.
Should be no functional changes.
|
| |
| |
| |
| | |
of GridRegion. New variables for size and code to initialize same.
|
| |
| |
| |
| | |
LLClientView to use same. This passes a terrain info class around rather than passing a one dimensional array thus allowing variable regions. Update the database storage for variable region sizes. This should be downward compatible (same format for 256x256 regions).
|
|/
|
|
|
|
|
|
| |
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
|
|
|
| |
(e.g. 1000, 1000) rather than meter positions (256000, 256000)
|
|
|
|
|
|
|
| |
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.
|
|\ |
|
| |
| |
| |
| | |
Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
|
|/
|
|
|
| |
This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing
changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
|
| |
|
| |
|
|
|
|
|
|
| |
range.
Also add GetHyperlinks() to the grid service.
|
|
|
|
|
|
|
| |
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
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| | |
and region. The non-error case should be compatible, so no version bump.
Untested.
|
| | |
|
| |
| |
| |
| |
| | |
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
|
|/ |
|
| |
|
| |
|
| |
|
|
|
|
| |
layer. This sounds fishy to me, but it's what's used to make external currency modules work, for now.
|
|
|
|
|
|
| |
HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
Fixed small bugs with hyperlinked regions' map positions.
|
|
|
|
| |
minimally. A few bugs to catch now.
|
|
|
|
| |
Added serverPort to the fields that get stored (I think this is the UDP port).
|
|
|
|
| |
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
|
|
|
|
| |
getting parameters and replies over the wire.
|
|
|
|
| |
code.
|
|
|
|
|
|
| |
SimpleRegionInfo.
Added grid configs to standalones.
|
| |
|
| |
|
| |
|