ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-27 09:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,653 Commits 5 Branches 106 Tags
b453ef0fbd3cc54752e97df9738bbc4a8a7c19d4
Commit Graph

97 Commits

Author SHA1 Message Date
UbitUmarov
239dcaffb7 coment out some debug, clean a bit 2015-09-26 14:14:05 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
UbitUmarov
f2259d37e2 review gridservice module. Not merged os code for varsize, since that 
should be handle at db level
 2015-08-28 20:26:24 +01:00
Oren Hurvitz
3a2d4c8b05 Added logging in places where regions are searched for by their location 
This commit also fixes the log message "Region already exists in coordinates <{0},{1}>": it was actually showing the *requested* coordinates, instead of the coordinates of the previously-existing link.
 2015-07-22 20:13:53 +03:00
Robert Adams
07dead7dcb varregion: any conversions of use of Constants.RegionSize converted into 
Util.cs routines to convert region coords to and from world coords or handles.
 2015-03-29 14:25:12 -07:00
Diva Canto
185e7048c8 On the GridService, the central simulator features: ensure that the map tile url ends with '/' because the viewer is dumb and just appends to it. 2015-01-22 10:45:07 -08:00
Diva Canto
2fd252f5a9 SimulatorFeatures: the viewer also takes GridName in OpenSim extras. Added that (plus GridURL, in case viewers want to use it too) to the GridService that gives out that info to simulators. 2015-01-10 10:32:33 -08:00
Justin Clark-Casey (justincc)
2d2aa6e076 minor: Just have one message that displays successful registration of a region with its parameters rather than 2 2014-12-03 21:40:39 +00:00
BlueWall
10a8d2852e OpenSimExtras 
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.
 2014-08-06 17:25:12 -04:00
Robert Adams
aa8b44c001 Add code to GridService to check for overlapping of varregions 
when registering a new region.

Adds parameter "[GridService]SuppressVarRegionOverlapCheckOnRegistration=false"
that can be turned on to suppress the error check if a simulator's database
has old regions that overlap.
 2014-07-20 10:34:09 -07:00
Justin Clark-Casey (justincc)
6048dfcd71 In grid mode, add SuppressConsoleCommands flag to [GridService] so that we can stop misleading grid service only console commands from registering. 
We need to do this because the simulator initializes and internal copy of the GridService in grid mode for internal purposes
 2014-07-18 22:57:04 +01:00
Justin Clark-Casey (justincc)
9be935ac6d Add ICommands.HasCommand() method so that we can detect whether a command has already been registered without needing to also run it 2014-07-18 22:27:39 +01:00
Justin Clark-Casey (justincc)
e008d54cd4 minor: Remove compiler warning in GridService 2014-07-14 19:28:43 +01:00
Justin Clark-Casey (justincc)
219d273418 Add experimental "show grid size" robust console command. 
This will show an approximate grid size that doesn't count regions that are hyperlinks
Not particularly trustworthy since it will still count regions that are not active but were not deregistered (deliberately or due to simulator crash or similar)
 2014-07-05 00:50:33 +01:00
Justin Clark-Casey (justincc)
82a5d00bc8 Adjust "show regions" and "show region" robust service console output to show size 
"show regions" drops the owner id column but is till present in "show region"
"show regions" name column expanded to allow for longer hg regions (probably still too short, may eventually have to truncate rather than taking up huge screen space)
 2014-07-05 00:15:35 +01:00
Melanie Thielker
159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2014-06-21 00:39:55 +02:00
Robert Adams
0300ec45eb Modifications to debugging printouts. No functional changes. 2014-05-31 12:19:51 -07:00
Melanie
321bde8a3a Minor: Add prentheses to make a condition clearer 2014-01-15 22:20:42 +01:00
Robert Adams
6869633d76 Add serialization/deserialization of region size to RegionInfo, GridRegion, 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.
 2013-12-28 06:58:15 -08:00
Robert Adams
2d2bea4aa7 varregion: many more updates removing the constant RegionSize and replacing 
with a passed region size. This time in the map code and grid services code.
 2013-12-26 22:45:59 -08:00
Robert Adams
7aa00632b9 varregion: many replacements of in-place arithmetic with calls to 
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
 2013-11-28 08:20:16 -08:00
Robert Adams
6df7d4219d varregion: add linkage for region size in creations and conversions 
of GridRegion. New variables for size and code to initialize same.
 2013-11-02 15:40:48 -07:00
Justin Clark-Casey (justincc)
4cbadc3c49 Allow one to specify a DefaultHGRegion flag in [GridService] in order to 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.
 2013-09-02 17:27:45 +01:00
Justin Clark-Casey (justincc)
04f4dd3dc7 remove redundant return at end of HandleDeregisterRegion() 2013-08-23 01:04:03 +01:00
Justin Clark-Casey (justincc)
2be786709b Make it possible for the "deregister region id" command to accept more than one id 2013-08-23 01:03:27 +01:00
Oren Hurvitz
1b826b4877 Allow registering regions whose names are equivalent under LIKE but not truly equal 2013-01-02 23:31:19 +00:00
Justin Clark-Casey (justincc)
73c9abf5f2 Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this. 2012-10-09 01:35:27 +01:00
Melanie
6ea95a3294 Fix and refactor region registration. Reorder checks to short-curcuit expensive and destructive ones. Properly fix region reservation and authentication. 
Make region moves and flags preservation work again as intended. Prevent
failes reservation take-over from damging reservation data.
 2012-08-25 17:32:00 +01:00
Justin Clark-Casey (justincc)
97437feb06 Show region positions in "show regions" robust console command 2012-06-26 23:05:10 +01:00
Justin Clark-Casey (justincc)
2524517986 minor: correct GridService "show regions" cibsike cinnabd usage statement 2012-06-26 22:54:41 +01:00
Justin Clark-Casey (justincc)
1f22b29ca3 Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods. 
Use these for new "show regions" command rather than old cumbersome stuff.
 2012-06-26 00:40:46 +01:00
Justin Clark-Casey (justincc)
5292b8b8be Add "show regions" console command to ROBUST to show all regions currently registered. 
Command is not added in standalone, which has its own version of "show regions" that can also show estate name
 2012-06-26 00:34:37 +01:00
Justin Clark-Casey (justincc)
854f2a913c Add "show region at" command to grid service to get the details of a region at a specific location. "show region" command becomes "show region name" to disambiguate 
This is the same format as used by "show object name", etc.
"deregister region" also becomes "deregister region id"
 2012-06-25 23:55:14 +01:00
Justin Clark-Casey (justincc)
5145356467 Add "deregister region" by uuid command to grid service to allow manual deregistration of simulators. 
Useful if a simulator has crashed without removing its regions and those regions have been reconfigured differently
 2012-06-13 03:49:22 +01:00
Justin Clark-Casey (justincc)
059a1e90b9 Add ConsoleDisplayList for more consistent formatting of console output in list form. 
Convert "show region" to use this structure rather than hand-constructing
 2012-05-23 03:19:25 +01:00
Justin Clark-Casey (justincc)
c6ce41bfba Add missing Y co-ord in "show region" console command information 2012-05-23 02:31:53 +01:00
Justin Clark-Casey (justincc)
050007b44d Lay out "show region" information in an easier to read line by line format 2012-05-23 02:30:16 +01:00
Justin Clark-Casey (justincc)
749c3fef8a Change "help" to display categories/module list then "help <category/module>" to display commands in a category. 
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
 2012-03-08 01:51:37 +00:00
Justin Clark-Casey (justincc)
10a23a823e Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages 
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
 2011-11-19 01:16:07 +00:00
Justin Clark-Casey (justincc)
d05d065d85 Improve some grid region log messages to express regions at co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000) 2011-11-19 00:29:52 +00:00
Justin Clark-Casey (justincc)
7a18078177 improve region deregistration log message 2011-11-19 00:10:29 +00:00
Justin Clark-Casey (justincc)
01ae916bad Don't register a region twice on both official registration and maptile regeneration. 
Maptile storage appears orthogonal to region registration
 2011-11-19 00:07:34 +00:00
Justin Clark-Casey (justincc)
156385f48b Tweak to language of last commit in rejecting UUID.Zero in GridService.RegisterRegion() 
Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426
It's probably a bad idea to allow these in any case.
 2011-10-08 02:15:04 +01:00
Pixel Tomsen
a6c5e00c45 GridService - Region UUID can not be NULL 
http://opensimulator.org/mantis/view.php?id=3426
 2011-10-08 02:13:18 +01:00
Justin Clark-Casey (justincc)
f18780d0e3 Get "show region" command in GridService to show grid co-ordinates rather than meters co-ord. 
This makes it consistent with "show regions"
Addresses http://opensimulator.org/mantis/view.php?id=5619
 2011-08-05 22:56:53 +01:00
Justin Clark-Casey (justincc)
b7f81d3492 If GetRegionByName can't match something in the local db, then search the hypergrid if that functionality has been enabled. 
This should fix the problem today where old style HG addresses (e.g. "hg.osgrid.org:80:Vue-6400") stopped working since 8c3eb324c4
 2011-08-02 01:06:32 +01:00
Justin Clark-Casey (justincc)
17e9d61f43 Change GridService.GetRegionByName() to only return info if there is an 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.
 2011-08-02 00:52:48 +01:00
Justin Clark-Casey (justincc)
e6fb9d74ef Revert "In GridService, have GetRegionByName() call GetRegionsByName() with a max return of 1 instead of duplicating code." 
This reverts commit 8d33a2eaa1.

Better fix will be along in a minute
 2011-08-02 00:40:23 +01:00
Justin Clark-Casey (justincc)
8d33a2eaa1 In GridService, have GetRegionByName() call GetRegionsByName() with a max return of 1 instead of duplicating code. 
This also fixes the problem where this method would not return a hypergrid region, unlike GetRegionsByName()
 2011-08-02 00:26:17 +01:00