ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-24 02:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
28,771 Commits 5 Branches 93 Tags
b52f7b920342b7ea3e0294eae054e7520801e339
Commit Graph

166 Commits

Author SHA1 Message Date
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
aa9a56d4df dont allow regions to be register on map area reserved for HG links 2016-12-16 21:15:21 +00:00
UbitUmarov
be490a8312 remove a nonsense option 2016-12-16 19:11:05 +00:00
UbitUmarov
e2d46c060c ok.. another try on the HG uri 2016-12-16 03:38:20 +00:00
UbitUmarov
c0a23d36df GetRegionsByName and GetHypergridRegionByName: detect that provided url is for local grid, and make it a local by region name local search 2016-12-15 23:48:25 +00:00
UbitUmarov
a3e2a42f0d HG regions URI need to include also the default ports for compatibility 2016-12-10 01:00:48 +00:00
UbitUmarov
874d663161 fix region area range 2016-12-01 04:02:29 +00:00
UbitUmarov
8299941517 fix region overlaps on registration 2016-12-01 03:45:43 +00:00
UbitUmarov
1aa4dbdb3f increase HG mapsearch spargetti; add more flexibility on input uri formats. To find regions in memory for a grid the http format needs to be used, because aditional compares made by viewers 2016-11-28 04:29:57 +00:00
UbitUmarov
d3cd323f0c HG on links request build the URI in http format with a / at end, this should not be needed but is coerent with current serverURI 2016-11-27 15:07:14 +00:00
UbitUmarov
81ef04c9fd fix type bug on hyperlinks 2016-11-21 16:55:51 +00:00
UbitUmarov
4c2ece3bcb HG LinkRegion receive region size also. Useless since olde r gatekeepers dont send it 2016-11-20 04:22:00 +00:00
UbitUmarov
5baceff4e9 stop a spamming robust debug message 2016-08-02 17:37:41 +01:00
Diva Canto
ea3fe90ddb Mantis #7928: show grid size and show regions now working. Integers were being overflown. 2016-06-19 13:57:01 -07:00
Diva Canto
ab12a14279 Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore. 2016-02-21 11:14:02 -08:00
Diva Canto
59b63b6406 On to 0.8.3! 
Conflicts:
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
 2015-10-18 21:51:49 -07:00
UbitUmarov
6ded1da9f2 ... merge issue 2015-09-28 15:49:22 +01:00
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
Diva Canto
32d87aa168 Mantis #7664: Added IHypergridLinker interface to establish a contract about what implementers need to provide publicly. This is used by 3rd-party addons such as Wifi. 2015-08-01 09:30:34 -07:00
Oren Hurvitz
43c8e2396e Added locking to HypergridLinker, to prevent problems if multiple linking requests for the same region are handled simultaneously 2015-07-22 20:39:30 +03: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
Diva Canto
da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -07: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
Justin Clark-Casey (justincc)
5450b1b024 Change assembly versions to 0.8.1 2014-06-17 18:37:15 +01:00
Robert Adams
0300ec45eb Modifications to debugging printouts. No functional changes. 2014-05-31 12:19:51 -07:00
Justin Clark-Casey (justincc)
f41809e07d minor: Capitalize Hypergrid help category like others 2014-05-08 22:39:52 +01:00
Oren Hurvitz
0d898d8d8a Revert "When linking a Hypergrid region, set the region's flags on the in-memory GridRegion immediately." 
This reverts commit 463d0b2f8f.
 2014-04-24 19:08:50 +03:00
Oren Hurvitz
463d0b2f8f When linking a Hypergrid region, set the region's flags on the in-memory GridRegion immediately. 
(When using llTeleportAgent() this *specific* object is used for the teleport, so it should have the correct flags.)
 2014-04-24 16:58:16 +01:00
Oren Hurvitz
6efc203ce8 Fixed: hypergrid-linking stopped accepting the following format: "http://grid.example.com" (without a region name) 
Fixes http://opensimulator.org/mantis/view.php?id=7128
 2014-04-24 06:19:57 +01:00
Oren Hurvitz
e1dd228f18 Better error checking when creating hyperlinks: a) Reject invalid strings; b) Default port is 80, not 0 
The change of default port may fix http://opensimulator.org/mantis/view.php?id=7108 , where a user was able to create a Hyperlink to OSGrid from inside OSGrid.
 2014-04-13 09:54:56 +01: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)
42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01:00