aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-02-151-6/+19
|\
| * In GridUserService, if a UUID is given consistently use the longest matched ↵Justin Clark-Casey (justincc)2014-02-151-6/+19
| | | | | | | | | | | | | | entry (as already done by GetGridUserInfo()) in order to avoid problems with multiple entries. This is to avoid issues where LoggedIn, SetHome, etc were always using the exact UUID match but GetGridUserInfo() would use the longest. Looks to address http://opensimulator.org/mantis/view.php?id=6986
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-02-143-306/+139
|\ \ | |/
| * Change warns associated with UserAgentServiceConnector to debugs, as this is ↵Justin Clark-Casey (justincc)2014-02-141-1/+1
| | | | | | | | | | | | not necessarily a problen with the source simulator (e.g. someone else's remote simulator cannot be contacted). This is Oren Hurvitz's second patch from http://opensimulator.org/mantis/view.php?id=6956 with a small amount of correction
| * If calls to UserAgentServiceConnector fail then throw an exception. This ↵Justin Clark-Casey (justincc)2014-02-143-294/+139
| | | | | | | | | | | | lets the caller decide whether to discard the error or not. This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
* | Fix - Viewer crash during HG TeleportRoger Kirkman2014-02-061-2/+2
| | | | | | | | Signed-off-by: Robert Adams <misterblue@misterblue.com>
* | Update the SimianMaptile uploader to accommodate varregions.Mic Bowman2014-02-051-74/+59
| |
* | Final code drop for appearance. Adding Avination's baked texture storage server.Melanie2014-02-041-0/+38
| |
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-311-2/+2
|\ \ | |/
| * Make sure Web streams are disposed after useOren Hurvitz2014-01-311-2/+2
| |
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-301-7/+22
|\ \ | |/
| * Record whether login to home fails because no home set (UUID.Zero) or region ↵Justin Clark-Casey (justincc)2014-01-301-7/+22
| | | | | | | | not found.
* | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-301-0/+33
|\ \ | |/
| * Add "show grid user" robust/standalone console command for debug purposes.Justin Clark-Casey (justincc)2014-01-301-0/+33
| | | | | | | | | | Shows all data on entries which match or start with a given ID. This would usually be a UUID.
* | varregion: pass region size in more HG services.Robert Adams2014-01-241-0/+12
| |
* | Enable the simulator to handle region size information returned fromMic Bowman2014-01-231-0/+12
| | | | | | | | | | a hypergrid gatekeeper. Fields are "size_x" and "size_y". Server side will be updated separately.
* | Merge branch 'master' into varregionRobert Adams2014-01-191-0/+7
|\ \
| * \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-161-0/+7
| |\ \ | | |/
| | * Can delete the Offline Messages sent to/from a user.Oren Hurvitz2014-01-161-0/+7
| | | | | | | | | | | | This is useful if the user is deleted.
* | | Merge branch 'master' into varregionRobert Adams2014-01-113-4/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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)
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-111-1/+1
| |\ \ | | |/
| | * Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.Oren Hurvitz2014-01-111-1/+1
| | |
| * | Remove some chatty DebugFormat statements. No functional changes.Robert Adams2014-01-042-5/+4
| | |
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-042-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | varregion: send region size in LLLoginResponse.Robert Adams2014-01-042-1/+13
| | |
* | | Merge branch 'master' into varregionRobert Adams2014-01-041-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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.
| * | 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-282-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-032-1/+19
| | | | | | | | | | | | | | | | | | | | | 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-265-56/+66
| | | | | | | | | | | | with a passed region size. This time in the map code and grid services code.
* | | varregion: add lots of DEBUG level log messages. Especially for teleport.Robert Adams2013-12-241-1/+1
| | |
* | | Merge branch 'master' into varregionRobert Adams2013-12-174-4/+81
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Add new region crossing code to varregion Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Populate user preferences with UserAccount email if it is present, else ↵BlueWall2013-12-161-0/+61
| |/ | | | | | | return an error indicating no email is on record for the user.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-12-062-0/+17
| |\
| | * Add support for user preferences (im via email)BlueWall2013-12-062-0/+17
| | |
| * | Fixed misleading commentDiva Canto2013-12-061-3/+0
| |/
* | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-142-4/+4
| | | | | | | | | | | | 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.
* | varregion: many replacements of in-place arithmetic with calls toRobert Adams2013-11-283-2/+7
| | | | | | | | | | the Util functions for converting world addresses to region addresses and converting region handles to locations.
* | Merge branch 'master' into varregionRobert Adams2013-11-241-6/+13
|\ \ | |/
| * If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase ↵Justin Clark-Casey (justincc)2013-11-151-6/+13
| | | | | | | | | | | | | | folder when required, then don't try to store the null and perform other operations on it. Patch from http://opensimulator.org/mantis/view.php?id=6844 Thanks Kira.
* | Merge branch 'master' into varregionRobert Adams2013-11-151-1/+1
|\ \ | |/
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | varregion: elimination of Constants.RegionSize from all over OpenSimulator.Robert Adams2013-11-083-10/+25
| | | | | | | | | | | | | | 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.
* | Merge branch 'master' into varregionRobert Adams2013-11-051-1/+2
|\ \ | |/
| * minor: comment out "SetLastPosition" GridUserService debug message for now.Justin Clark-Casey (justincc)2013-11-051-1/+2
| |
* | Merge branch 'master' into varregionRobert Adams2013-11-041-8/+11
|\ \ | |/
| * Give the caller AddMapTile a valid reason response if this failed due to ↵Justin Clark-Casey (justincc)2013-10-291-8/+11
| | | | | | | | | | | | blank response from server or connection failure. Raise log lines which indicate problems to warning from debug
* | varregion: send region size in LLLoginResponse.Robert Adams2013-11-022-1/+13
| |
* | varregion: add linkage for region size in creations and conversionsRobert Adams2013-11-022-0/+25
| | | | | | | | of GridRegion. New variables for size and code to initialize same.
* | varregion: push TerrainData implementation up and down the database storage ↵Robert Adams2013-11-011-0/+10
| | | | | | | | | | | | | | stack. Implement both LoadTerrain and StoreTerrain for all DBs. Move all database blob serialization/deserialization into TerrainData.