410ae96d04
put back diva's cache with her recent fix but also avoid duplicated InventoryService.UpdateItem call in case of m_uploadState is complete. In that case CompleteItemUpload will do it
2015-09-11 22:26:05 +01:00
af0febf6a7
inventory mess
2015-09-11 19:55:38 +01:00
29aaf5564f
Mantis #7720 : AssetXferUploader was setting AssetID to UUID.Zero. Before that wouldn't matter (item would be a terminal object) but with the introduction of the item cache, it matters, because the object in the cache was being modified to have AssetID=UUID.Zero. Also keeping the item cache consistent when item properties change.
2015-09-11 09:48:51 -07:00
6a0465b70a
remove diva's inventory cache since it seems to cause mantis 7720, broken items UUID. Guess it doesn't cover all paths
2015-09-11 04:46:15 +01:00
b93412972e
revert SynchronousRestObjectRequester timeout to miliseconds, and fix where it was wrong set in seconds
2015-09-09 23:17:18 +01:00
e5367d822b
Merge of ubitworkvarnew with opensim/master as of 20150905.
...
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
82ea4179da
Clean up viewer-based access control specifications.
2015-09-06 10:00:20 -07:00
d00f73c3a4
Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework.
2015-09-04 14:39:23 -07:00
cdaed11387
at last we can login and see objects ( friends is dead and disable in
...
scenepresence)
2015-09-03 18:39:08 +01:00
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
ecfd442c9b
cache in memory water texture
2015-08-30 11:02:59 +01:00
46054d4f02
review ServiceBase for var
2015-08-28 20:54:59 +01:00
ee4f61fe34
review llLoginService for var support
2015-08-28 20:49:29 +01:00
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
ce883e9b43
add more of the v03 checks and homeURL. Sending side only for now
2015-08-26 05:29:08 +01:00
17e920aacd
More plumbing on agent states
2015-08-20 00:40:49 +02:00
028506cf3c
Partial plumbing for the agent stateful module features negotiation
2015-08-20 00:18:45 +02:00
4cbbbefbf6
Removed ignoreCase=true from the call to Type.GetInterface, because, well, we don't want to ignore case. And this seems to be causing problems in mono 4.3.
2015-08-15 16:08:14 -07:00
d9a9f6f43b
Convert the enum to int before casting it to string for DB query
2015-08-08 13:47:42 -07:00
959872315f
WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum.
...
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
2015-08-08 12:12:50 -07:00
f218cbd29d
max-agent-groups support
...
Robust now tells viewers what the maximum number of groups is. Viewers show this limit to the users, and enforce it.
The default is 42, which is what viewers had assumed was the maximum number before this update.
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-08-07 07:42:26 +01:00
c4f8630968
In the AgentCircuitData of HG users, set the last name to include the port
...
E.g., instead of "first.last @grid.example.com", the name is now "first.last @grid.example.com:8002"
2015-08-03 16:25:45 +03:00
ce62824b1f
Add HGFSAssetService to the HypergridService to provide HG support for FSAssets.
2015-08-02 20:02:36 +01:00
c8cd2f18f5
Mantis #7657 : similar fixes for FSAssets.
2015-08-01 20:27:04 -07:00
e5a1243abc
Mantis #7657 and #7514 . This should alleviate the problem of bad object assets being passed around via HG and archives. No guarantees that all the leaks have been found, but at least it detects and fixes these bad assets upon:
...
(1) storing and getting assets over HG -- assuming the core HG asset service is being used (not the case with OSGrid!)
(2) importing assets via OAR and IAR
Instantiation of bad assets now should also work, instead of producing an exception, but the bad assets themselves aren't being fixed in the DB. That should be done with a cleaning tool -- see Perl script in Mantis #7657 .
Virus!
2015-08-01 18:58:05 -07:00
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
368ea78d14
Show last online status of group members from the PresenceService in group profiles
...
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2015-07-31 17:19:13 +01:00
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
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
248c0e18de
Prevent multiple instances of the FSAssets service causing problems. Protect against secondary instances registering duplicate console commands Also prevents multiple instances each starting a writer thread which will cause major file access exceptions as they fight over the contents of the spool directory.
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-07-13 19:04:33 +02:00
f3f748ed11
Bringing FSAssets more inline with current OpenSim standards. * If no connection string found in assets config, fallback to using default database config * Create database storage interface to allow other db connectors to be written at some point * Add MySQL migrations file to create the initial db table * Added new config option named DaysBetweenAccessTimeUpdates to reduce db load by only updating access times when fetching assets if the last access time was over the threshold. This idea was taken from XAssets service. * Change log message headers to indicate FS assets is the source not just assets
...
Signed-off-by: Melanie Thielker <melanie@t-data.com>
2015-07-12 04:03:08 +02:00
c59144ff13
More cleanup, add missing refs to prebuild, remove refs to stuff not
...
used. Will NOT compile.
2015-07-11 19:27:19 +02:00
a343c07d12
Some cleanup, add prebuild project, correct path
2015-07-11 19:21:32 +02:00
2672637202
Rename for uniformity, add data module
2015-07-11 19:10:39 +02:00
db62e1ac3c
Add main FSAssetsService
2015-07-11 19:07:42 +02:00
c299414d50
Fixed bad-ish code in login patch
2015-06-25 15:01:43 -07:00
4131fbea0c
Changes to Welcome Message sent to clients.
...
.gitignore | 1 +
OpenSim/Services/LLLoginService/LLLoginService.cs | 32 +++++++++++++++--------
1 files changed, 22 insertions(+), 11 deletions(-)
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-25 14:53:51 -07:00
bcb8a7d7f9
A few bug fixes for Agent Preferences to actually work. Also added missing config for standalone.
2015-06-13 08:36:06 -07:00
0fa94f222d
Refactor AgentPreferences so that database operations happen centrally. the opensim way.
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-13 07:27:42 -07:00
b931f393a8
Avoid registering console commands in every single instance of GridUserService running on the same process. Only one registers them now.
2015-06-09 13:21:41 -07:00
c4efeb0f7c
Upgraded the Simian inventory connector with an item cache, too, so that it doesn't get awfully out of sync with the improvements I'm making to the robust service connectors, which are being fully leveraged by the simulator. This Simian connector needs more love...
2015-06-05 11:46:13 -07:00
96f0c6f074
More on mantis #7567 . Two things:
...
- Increase the inventory cache timeout to 20 secs, so that the items will still be there when they are needed by the sim for rezzing
- Before rezzing attachs, make a call to GetMultipleItems so to fetch them all at the same time
2015-06-05 10:07:50 -07:00
51fccff235
Mantis #7600 . The warning message was not a symptom of a problem, it was just that the HG client was trying to fetch folders that aren't in the Suitcase, so that fails. This should make the warning message go away in that situation. (fetching those folders will still fail, because they aren't available over HG)
2015-06-04 15:04:36 -07:00
a433a40980
Making the inventory cache static, so that there's less timers.
2015-06-04 07:10:06 -07:00
ea5aa82c2c
Mantis #7567 . Once again, avoiding prefetching linked items within linked folders. Also fixing the inventory connector GetMultipleItems, so that if everything is in the cache, it returns successfully rather than unsuccessfully.
2015-06-04 06:58:07 -07:00
bac53387a9
Mantis #7567 : added an 8-sec expiring item cache to the inventory network connector. This fixed the problem on my local test grid and generally made things faster. This cache has been needed for a while... there are many parts in the code where the sim gets an item multiple times in a short amount of time (rezzing attachs and objects, for example).
...
Other minor changes:
- added the scene as a parameter to the constructor od FetchInvDescHandler, so that I could see in which scene the handler was being called
- brought linked items in linked folders back to being prefetched
2015-06-03 17:42:41 -07:00
923a57a91f
Added tests for UserAccountService in Robust. In the process fixed a couple of bugs in the network connectors. For some reason the robust-bound code had a CreateUser method, while the client-bound code had no such method. I assume someone is extending the client-side code with their own connectors. I added the missing method, but didn't add it to the service interface.
2015-05-11 19:55:23 -07:00
3df472f10d
Added inventory tests to Robust.Tests.
2015-05-11 08:52:12 -07:00
3c596e47c6
Knocked off a few compiler warnings regarding unused variables.
2015-05-10 21:54:24 -07:00
eb9b16d284
Added simple test for IM in Robust too.
...
Changed Inventory data to use the mock one in Common Tests. (but still not inventory tests)
2015-05-10 21:49:24 -07:00
0bf1209f90
Another major overhaul of inventory downloading, this time pertaining to inventory links. Added yet another function to IInventoryService to get multiple items at once, so that fetching collections of linked items is done once per folder instead of once per item.
2015-05-08 20:53:28 -07:00
3548e39f9a
I shouldn't write code this early in the morning... Fixing a 'duh' on previous commit.
2015-05-08 07:36:30 -07:00
a68aab14fa
Additional debug message to help diagnose a warning message and exception related to previous commit.
...
See http://opensimulator.org/mantis/view.php?id=7054#c28282
2015-05-08 06:57:06 -07:00
c74cef0f42
Major change in the way inventory is downloaded: added a method throughout IIventoryService that fetches sets of folders at once. Also added folder id in the InventoryCollection data structure, so that we don't need to go to inventory server again just for that. This reduces the chatter between sims and inventory server by... a lot. On my tests, this reduces initial inventory download down to 30% of what it currently is.
2015-05-07 19:24:08 -07:00
1abbad71b4
Refactored some code that is used in two different dlls related to SOP rewriting. Also added some unit tests that relate to mantis #7514
2015-05-05 20:59:09 -07:00
4211309ec7
Corrected typo in namespace
2015-05-02 10:27:57 -07:00
da32512ea4
Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*")
2015-04-29 18:47:17 -07:00
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
bedafb8fae
varregion: refactor use of 'double heightmap[,]' into references to new class TerrainData
...
and push the implementation from Scene into the database readers and writers.
2015-03-27 19:32:50 -07:00
0ea6977013
solving HG IM, HGFriends issues based on falsified GridUser data
...
it does not consider GridUser as a viable source for residents' data.
it does not consider Friends, Inventory Creators to be trusted at all. There are lots of broken entries in existence.
There are lots of broken creator data fields in assets.
The following issues arise from the broken data in the old User Management Module:
failing HG IM
failing HGFriends Requests
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-05 16:17:12 -05:00
6161817f72
corrected handling when XML parsing in Presence Connector fails
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2015-03-03 15:35:16 -05:00
6da356a7e4
minor: Remove mono compiler warnings from EstateDataConnector
2015-02-28 00:54:23 +00:00
edc155c636
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-01-22 10:45:46 -08:00
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
ed8d0fbea4
Don't allow a failure in create a request in HeloService.Connector.Helo() to propogate up the stack.
...
Relates to http://opensimulator.org/mantis/view.php?id=7421
2015-01-21 20:46:29 +00:00
abf1836b81
Fix OfflineIMEmail value overwriting every time its called. The request was receiving a blank user prefs object to populate but then was checking for an email address. When this failed the email address was pulled from the User Account service and the empty prefs now including the email was saved before being loaded again to be returned. This was overwriting all other settings in the prefs. This fix returns the existing prefs first before checking the email address is set, and only updates email if missing.
2015-01-21 00:57:06 +00:00
beef41f24c
Stop simulators attempting to contact registered but offline regions (RegionFlags.Persistent but not RegioNFlags.RegionOnline) on startup and when an avatar completes a teleport.
...
This eliminates spurious network calls and failure reporting.
This is done by adding RegionFlags to the GridRegion returned data in a backward compatible way as an alternative to multiple IGridService.GetRegionFlags() calls
Using a simulator or a grid service older than this commit will just see previous behaviour.
2015-01-14 19:45:19 +00:00
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
e2dd15625f
Added GetDisplayNames capability. For now, we don't actually use display names, and this cap returns the regular name. But this moves the server side into the newer, preferred, protocol used by the viewer for fetching the names of agents in the scene given their UUIDs. (the old protocol is via UDP). This works fine in my limited tests, but could use further testing by others.
2015-01-09 08:31:56 -08:00
8e562f04d1
Donation of robust network connectors for estate service, as promised. This allows to have one central database for estates without having to open the MySql port. This is off by default, so not to disturb everyone's existing installations. To use it, see GridCommon.ini.example [EstateDataStore] section and Robust*.ini.example's new additions.
...
Note that I also made things consistent by removing both the EstateDataService and the SimulationService into their own dlls, just like all other services. They really didn't belong in Services.Connectors, since everything in that component is about network connectors to robust backends. We may have too many dlls, and at some point it might not be a bad idea to merge all services into one single dll, since they all have more or less the same dependencies.
2015-01-06 21:24:44 -08:00
bd2ec3edf5
Bug fix in LoadPLugin so that it can take paths to dlls that look like this "C:\foo\MyDll.dll:MyType" -- the split on : was messing things up.
2015-01-02 09:16:39 -08:00
2138d5c7f8
Renamed VERSION_NUMBER to VersionNumber
2014-12-30 15:27:28 -08:00
7466ef0525
This cleans up versioning. Specifically:
...
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions
It also eliminates the last addin.xml files that were still there, for consistency.
2014-12-30 12:53:31 -08:00
5cf6a6f830
WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT.
...
This cleans up Opensim's use of mono addins. In particular, the extension points /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to OpenSim.Region.Framework.dll. From here on, developers of region modules should declare their dlls to be dependent on OpenSim.Region.Framework, starting with version 0.8.1
Additional changes:
- Addins version uniformly updated to 0.8.1. These numbers should be compatible with the release numbers or else it becomes very confusing.
- Mono addins directives moved from files addins.xml to embedded directives in the class and assembly declarations, to make it all consistent
2014-12-30 07:58:42 -08:00
89c1ac4cff
Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number doesn't need to match the release version number, but I think it's a very good idea that they do.
2014-12-29 15:05:44 -08:00
b39d697555
Adding command to reset user's email address
2014-12-16 12:20:56 -05:00
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
aeae34505f
When processing incoming attachments via HG, if a request for uuid gathering or final asset import takes too long remove remaining requests from same user to prevent hold up of other user's incoming attachments.
...
This improves upon the earlier naive simply queueing immplementation.
Threshold is 30 seconds. If this happens to a user they can relog and fetch will be reattempted.
2014-11-25 23:23:11 +00:00
ec8d21c434
Label all threadpool calls being made in core OpenSimulator. This is to add problem diagnosis.
...
"show threadpool calls" now also returns named (labelled), anonymous (unlabelled) and total call stats.
2014-11-25 23:23:10 +00:00
bb5e2e1f02
refactor: Use simpler auto-implemented property for HttpPort in GridRegion
2014-11-25 23:18:39 +00:00
13e2af7525
minor: Remove compiler warning from GridRegion in IGridService
2014-11-25 23:18:39 +00:00
968b588bb9
minor: remove compiler warning from OpenProfileClient
2014-11-25 23:18:39 +00:00
41cc73233c
Re-work handling of email notifications settings.
2014-11-24 11:00:47 -05:00
12108bf6e9
Fix handling of user preference updates where no email address is supplied
2014-11-23 14:25:48 -05:00
5bc389ff71
When logging reigon information returned by GateKeeperService.GetHyperlinkRegion, log the return server URL returned.
...
This helps diagnoses misconfiguration where, for instance, a LAN ExternalHostName has been configured that isn't reachable externally.
2014-11-21 20:40:59 +00:00
b9f870fa73
Minor: Update LLLoginService to handle explicitly set login locations that include decimal precision. Fractions might be introduced if setting the initial login location from a viewer splash screen with data from the DataSnapshot service. At present the fractions cause regex to fail when matching the login string causing an exception.
2014-11-19 18:44:45 +00:00
b463870914
Add hypergrid teleporting support to user profiles picks
2014-10-27 17:27:42 -04:00
e59a9a54f1
bug fix
2014-10-26 10:05:48 +00:00
fd79f75ba6
TEST**** wingridproxy detection at grid login. Untested possible not
...
very reliable. Adds some load even on region servers because of code at
BaseHttpServer.
2014-10-24 02:12:30 +01:00
f35f90bd72
dont give a ring to each asset request, just one to rule them all, i mean
...
thread not ring
2014-09-18 19:40:59 +01:00
060984502e
and another one
2014-09-17 17:00:13 +01:00
e19d1ecce8
Cleanup some unused code and configuration entries
2014-09-03 17:09:57 -04:00
3341bbbc3b
Merge branch 'avination-current'
2014-08-23 19:12:12 +02:00
39e052982b
Fix a null ref that will cause an exception if a grid region doesnt' specify a URI.
2014-08-23 19:10:15 +02:00
1a7efc2c64
Change the map tile system to be multi-grid hosting compatible
...
Conflicts:
OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
2014-08-23 17:33:14 +02:00
cbd7c7b9ec
Change the map tile system to be multi-grid hosting compatible
2014-08-23 17:27:01 +02:00
8738445eb7
Move the inventory request lock introduced in git master a58152bd to HGInventoryBroker to preserve that behaviour there but allow 2 simultaneous inv requests (chiefly WebFetch) rather than 1
...
This lock serialized all requests and made the inventory throttling in WebFetch redundant.
By moving this lock, two simultaneous requests may now take place which may help with http://opensimulator.org/mantis/view.php?id=7054
2014-08-09 00:52:51 +01:00
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
327632dc66
Add inventory.<url>.RequestsMade stat.
...
This gives a count of all requests made to the remote inventory service.
This is finer grained than inventory.httpfetch.ProcessedFetchInventoryRequests since such a request can be comprised of many individual inv service calls.
In addition, this will count requests that don't go through the HTTP inventory fetch (e.g. HG, archiving, etc.)
2014-07-26 02:17:04 +01:00
c0c92a95bf
Add undocumented RemoteRequestTimeout seconds parameter to xinventory requests
...
This is for testing purposes (chiefly http://opensimulator.org/mantis/view.php?id=7054 ) so many not be permanent
Setting this will change the xinventory request timeout from the simulator from the default 100 seconds
2014-07-25 23:06:23 +01:00
3a87cce2e0
Fix recent regression in 3c6becd5 where login or hg login to variable sized regions failed with outdated simulator message.
...
I forgot that a null 'their version' would not be passed over the wire and ends up as an empty string instead (like older simulators).
So instead pass through the correct simulator protcol version instead (SIMULATOR/0.3) when querying from login or hg login.
Also removes a debug console write for agent limit accidentally left in for the same commit.
Relates to mantis 7276
2014-07-22 18:04:28 +01:00
3c6becd524
On login and first HG entrance to a foreign grid, perform query access checks before proceeding.
2014-07-21 23:53:33 +01:00
9fa8d84598
Eliminated some warnings
2014-07-21 08:30:10 +01:00
99ac770abb
Close streams immediately when we finish using them
2014-07-21 08:30:03 +01:00
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
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
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
e008d54cd4
minor: Remove compiler warning in GridService
2014-07-14 19:28:43 +01:00
ba233008cd
Changed GetUserInfo so that the exposure of user account details is ruled by a configuration variable. It's on by default.
2014-07-06 16:02:04 -07:00
108978be1e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-07-06 15:17:27 -07:00
63b5c11b9c
Lookup username given key(uuid) XML-RPC
2014-07-06 15:14:55 -07:00
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
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
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
5450b1b024
Change assembly versions to 0.8.1
2014-06-17 18:37:15 +01:00
fe779128b0
Added simulation version compatibility check so that agents coming from 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer.
2014-06-06 11:04:53 -07:00
0eaca7aafb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-06-01 10:06:59 -07:00
2ff9ea3f80
Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector.
...
Also added more packing/unpacking code.
2014-06-01 10:06:26 -07:00
a2ea844494
Move the generation of the multi-resolution map tiles off the main
...
region creation thread. For varregions or simulators with many regions,
this will speed up simulator startup and elimiate some thread timeout
warnings.
2014-05-31 14:21:39 -07:00
0300ec45eb
Modifications to debugging printouts. No functional changes.
2014-05-31 12:19:51 -07:00
d6f9f690e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-31 08:22:56 -07:00
0eede1467f
Moved these two estate-related interfaces to the projects where they belong.
2014-05-30 13:11:46 -07:00
c32ccfb520
minor: Comment out 2 error level debugging message in authentication code
2014-05-27 23:18:33 +01:00
1fa3a6f1bd
When creating a new user, create the folders "Current Outfit", "Favorites", and the standard subfolders of "Calling Cards".
...
(If we don't create them now then they'll be created later by the viewer, but why wait.)
2014-05-25 15:34:49 +01:00
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
47b84875fd
Tell QueryAccess explicitly whether the user is coming in via Teleport or Cross, because the permission checks are different.
...
Previously we used a heuristic of checking if the entry position is 0 to differentiate between Teleport and Cross, but that doesn't work anymore since we've started providing the precise entry position for cross, too. That's required in order to ensure that the user is allowed to enter the parcel that he's walking into.
2014-05-19 11:19:11 +01:00
78733b979f
Log the user when an inventory operation is blocked because the item/folder isn't in the Suitcase
2014-05-19 11:12:53 +01:00
dd30a29ba0
Return more specific error messages if an attempt to enter a region fails due to permissions (in QueryAccess and IsAuthorizedForRegion)
2014-05-19 11:11:30 +01:00
c23d37a509
Fix recent asset request timeout issue by commenting out (for now) the m_maxAssetRequestConcurrency mistakenly passed in as a timeout to SynchronousRestObjectRequester.MakeRequest()
...
For a long time, possibly forever, the m_maxAssetRequestConcurrency was mistakenly passed in as a 30 ms timeout rather than as a concurrent connection limiter.
This didn't come to light until the timeout was actually used in recent commit faf9ba53http://opensimulator.org/mantis/view.php?id=7165
2014-05-14 00:11:07 +01:00
bf8f64e40e
Fixed error if a user didn't have a "Current Outfit" folder in their suitcase.
...
This fixes http://opensimulator.org/mantis/view.php?id=7161
2014-05-12 08:54:31 +03:00
f41809e07d
minor: Capitalize Hypergrid help category like others
2014-05-08 22:39:52 +01:00
df49196e17
Log whenever an inventory operation is blocked because the item/folder isn't in the Suitcase
2014-05-06 07:28:43 +01:00
0fe08c8799
- When sending the "My Suitcase" folder to the client, always claim it has Folder Type 8. (Previously we had used Folder Type -1 in one place, and LLClientView didn't even bother changing Folder Type 100 to anything else.)
2014-05-06 07:16:37 +01:00
88f7a833dc
Improved HTTP logging
2014-04-29 07:59:17 +01:00
cb8c3ba023
Removed dependency on Linq in OpenProfileClient
2014-04-28 16:41:02 +01:00
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
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
bc06db3df4
- Created a standard function to send XML-RPC requests, which logs them like we do for other types of HTTP activity.
...
- Changed OpenProfileClient to use the new XML-RPC sending function
- Improved logging in WebUtil
2014-04-24 15:58:43 +01:00
d62f0bc35d
Refactored: moved OpenProfileClient to a location where it can be used by both the Simulators and Robust
2014-04-24 15:58:42 +01:00
d15a3b10a3
When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6".
2014-04-24 15:58:41 +01:00
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
018832522c
Removed GetUserInventory(). It wasn't being used, and was creating warnings because it's Obsolete.
2014-04-23 14:38:33 +01:00
998d7009a6
Eliminated many warnings
2014-04-23 16:37:36 +03:00
617bc4710a
Workaround for SRAS: if Store Asset returns 'null' then assume the asset already exists, and this isn't an error
2014-04-23 14:19:24 +01:00
06db136fbc
Removed an attempt to set a user's presence to "Region 0" when they HG teleport to another grid.
...
a) This shouldn't have been done because at that point the user is still logged-in to the current grid. b) It's not necessary because the user will soon be logged-out completely. c) And it didn't even work because the MySQL database layer prevents setting the region to 0.
2014-04-21 16:56:14 +01:00
acc2c42a79
Better logging in PresenceService, to help diagnose presence problems.
2014-04-21 18:55:53 +03:00
3f76f72137
Better error-handling when storing assets: recognize that 'null' is an error value
2014-04-20 06:23:38 +01:00
52f8669169
Stopped setting the Service URL "GatekeeperURI" on users' accounts. It isn't actually used.
2014-04-20 06:23:37 +01:00
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
06e0528d0b
In teleports, pass the source region to the destination (similar to an HTTP referrer)
2014-04-09 09:22:20 +01:00
cf1686335f
Log when the presence service logs-out all the users in a region
2014-04-09 06:06:52 +01:00
e00f1a0410
Allow invalidating the users cache
2014-04-08 08:11:29 +01:00
86105a1533
Better (amend to previous commit)
2014-04-07 19:51:26 -07:00
c0fd09b445
Avoid calling HELO service on malformed URLs. This is in response to an exception reported by danbanner.
2014-04-07 19:41:25 -07:00
85d51e57a9
When sending QueryAccess to a region, also send the user's Home URI
2014-04-07 07:32:36 +01:00
abe0f4a088
When preparing a Hypergrid teleport, tell the receiving grid which user is entering the grid.
...
This can affect which region to use. E.g., returning users may be allowed to enter any region, whereas users from other grids will have to enter a gateway region. Previously per-user decisions were only made later, but by then it's too late to change which region the user enters.
2014-04-06 15:40:45 +01:00
6d2893be67
When teleporting using Hypergrid, show more informative error messages in case of error
2014-04-03 14:13:03 +01:00
d1c3f8eef5
Added assets service method AssetsExist(), which returns whether the given list of assets exist.
...
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
2014-04-02 06:30:57 +01:00
ba5a236922
Profiles local StorageProvider fix, round 3
2014-03-27 13:41:20 -04:00
20640357ab
Fix to local StorageProvider override
2014-03-27 13:27:46 -04:00
9c7b28341c
Add support for specifying non-default StorageProvider
2014-03-27 12:36:30 -04:00
2fbb906ff6
Reinsert code to extract size_x and size_y parameters from GetHomeRegion response in UserAgentServiceConnector.
...
This is actually code from commits afb2e07cf61cdf
2014-03-26 02:34:22 +00:00
6a477e044d
If prim region crossing fails then don't delete the prim from the original region
...
Resolves http://opensimulator.org/mantis/view.php?id=6946
2014-03-24 18:24:50 +01:00
0ff61341e4
HGAssetService searches for the "HomeURI" setting in several sections: Startup, Hypergrid, HGAssetService
...
Resolves http://opensimulator.org/mantis/view.php?id=6940
2014-03-24 18:02:22 +01:00
5b2af7f99e
Moved the linkage between LoginService and HGInventoryService to the config file
2014-03-24 18:33:18 +02:00
df9845a283
When a user logs-in, automatically create the Suitcase folder
...
This is only done if the Suitcase Inventory Service is used.
Previously the Suitcase was created at a later time, which meant that it wasn't shown in the viewer until the viewer was restarted.
2014-03-24 17:02:13 +01:00
4bccfed80c
When logging in UserAgentServiceConnector, always log the original server URL (the hostname), not the IP
...
This resolves http://opensimulator.org/mantis/view.php?id=6955 (that patch was modified a bit)
2014-03-24 14:20:19 +02:00
921f0052f4
Get the full viewer name even if it's (incorrectly) sent in the 'Channel' field
...
Recent versions of Firestorm and Singularity have started sending the viewer name in the 'Channel' field, leaving only their version number in the 'Viewer' field. So we need to search both of these fields for the viewer name.
This resolves http://opensimulator.org/mantis/view.php?id=6952
2014-03-24 12:26:52 +01:00
6734b94761
Better error messages
...
This resolves http://opensimulator.org/mantis/view.php?id=6936
2014-03-24 12:22:32 +01:00
7f027552ec
If we find an existing suitcase folder in HGSuitcaseInventoryService.GetRootFolder(), then return that as a response rather than null.
...
Fixes a regression from commit 346644016chttp://opensimulator.org/mantis/view.php?id=6969
But I'm assuming that was a mistake since clearly we should be returning this data - this was original behaviour
2014-03-20 20:36:47 +00:00
c0cdc6b74f
Add delete maptile ability to MapImageService - yet untested
2014-03-18 02:16:00 +01:00
a53272c5fb
Add delete maptile ability to MapImageService - yet untested
2014-03-18 00:50:00 +00:00
d50d169441
If GetFolderContent called by WebFetchInvDescHandler.Fetch() fails for some reason and returns null, log and return empty contents rather than throwing an exception that ends up terminating the simulator.
2014-02-20 22:35:41 +00:00
f6913e911e
Merge branch 'justincc-master'
2014-02-15 01:18:10 +00:00
f74aafaf63
In GridUserService, if a UUID is given consistently use the longest matched 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
2014-02-15 01:13:58 +00:00
ffd0da23fb
Merge branch 'justincc-master'
2014-02-14 00:16:17 +00:00
f49d513089
Change warns associated with UserAgentServiceConnector to debugs, as this is 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
2014-02-14 00:08:13 +00:00
fc35b45e21
If calls to UserAgentServiceConnector fail then throw an exception. This 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.
2014-02-14 00:01:12 +00:00
cf61cdf58c
Fix - Viewer crash during HG Teleport
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-02-06 11:33:17 -08:00
1913ab5ad5
Update the SimianMaptile uploader to accommodate varregions.
2014-02-05 21:26:39 -08:00
f0f852b27f
Final code drop for appearance. Adding Avination's baked texture storage server.
2014-02-04 02:29:02 +00:00
b2878eb773
Merge branch 'justincc-master'
2014-01-31 00:51:22 +00:00
b8e22f02e7
Make sure Web streams are disposed after use
2014-01-31 00:44:22 +00:00
c467dfcd81
Merge branch 'justincc-master'
2014-01-30 00:42:20 +00:00
b73baeb4a4
Record whether login to home fails because no home set (UUID.Zero) or region not found.
2014-01-30 00:40:56 +00:00
7807b19a89
Merge branch 'justincc-master'
2014-01-30 00:05:12 +00:00
bdab05df0e
Add "show grid user" robust/standalone console command for debug purposes.
...
Shows all data on entries which match or start with a given ID.
This would usually be a UUID.
2014-01-30 00:03:22 +00:00
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
4ccb15290e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
afb2e07111
varregion: pass region size in more HG services.
2014-01-24 06:30:38 -08:00
674a3a5639
Enable the simulator to handle region size information returned from
...
a hypergrid gatekeeper. Fields are "size_x" and "size_y". Server side
will be updated separately.
2014-01-23 16:20:18 -08:00
f127e4b4ee
Merge branch 'master' into varregion
2014-01-19 07:38:53 -08:00
1a8b56fa87
Merge branch 'justincc-master'
2014-01-16 00:33:04 +00:00
2d9d6fe922
Can delete the Offline Messages sent to/from a user.
...
This is useful if the user is deleted.
2014-01-16 00:24:51 +00:00
321bde8a3a
Minor: Add prentheses to make a condition clearer
2014-01-15 22:20:42 +01:00
1cf17a3cf7
Merge branch 'master' into varregion
...
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)
2014-01-11 08:52:23 -08:00
b5ef585069
Merge branch 'justincc-master'
2014-01-11 01:22:42 +00:00
bc0ff5e7d4
Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.
2014-01-11 00:54:41 +00:00
1eecb34e62
Remove the core module extra profile settings support carried in with the latest
...
patches. We don't need it.
2014-01-05 21:16:30 +00:00
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
8ff2ff1a36
Remove some chatty DebugFormat statements. No functional changes.
2014-01-04 19:01:04 -08:00
7e32313a49
varregion: Add region size to teleport event messages (EnableSimulator,
...
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
2014-01-04 19:01:04 -08:00
004ecee314
varregion: send region size in LLLoginResponse.
2014-01-04 19:01:03 -08:00
fd045d520e
Merge branch 'master' into varregion
...
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.
2014-01-04 08:57:51 -08:00
9984ecf862
varregion: Add region size to teleport event messages (EnableSimulator,
...
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).
2014-01-03 07:41:06 -08:00
eab9390e05
Initialize default region size in GridRegion in the no parameter constructor
...
as is used by the grid connector tests.
2013-12-28 07:20:14 -08:00
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
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
e5f7c8b6e8
varregion: add lots of DEBUG level log messages. Especially for teleport.
2013-12-24 12:31:26 -08:00
6937eec258
Merge branch 'master' into varregion
...
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-17 06:18:13 -08:00
b03ec6137f
Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user.
2013-12-16 17:36:04 -05:00
13a9a4b653
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
...
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.
2013-12-14 07:53:01 -08:00
958a8f274b
Revert "Add support for user preferences (im via email)"
...
This reverts commit 1842388bb4
2013-12-07 01:29:15 +00:00
ba48816fb6
Merge branch 'master' into careminster
2013-12-07 01:19:20 +00:00
5047bd7b44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-12-06 16:02:03 -08:00
4058e5f709
Fixed misleading comment
2013-12-06 16:01:29 -08:00
1842388bb4
Add support for user preferences (im via email)
2013-12-06 02:52:13 -05:00
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
3193bcaae1
Merge branch 'master' into varregion
2013-11-24 07:23:12 -08:00
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
346644016c
If HGSuitcaseInventoryService.GetRootFolder() fails to create a suitcase 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.
2013-11-15 23:10:59 +00:00
604b39cea9
Merge branch 'master' into varregion
2013-11-15 14:56:13 -08:00
7cab41f422
refactor: replace verbose checks with String.IsNullOrEmpty where applicable.
...
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
2013-11-15 21:45:08 +00:00
beeec1c467
varregion: elimination of Constants.RegionSize from all over OpenSimulator.
...
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.
2013-11-08 20:53:37 -08:00
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
a75ce7423c
Merge branch 'master' into varregion
2013-11-05 21:42:27 -08:00
fb23f78928
minor: comment out "SetLastPosition" GridUserService debug message for now.
2013-11-05 23:18:09 +00:00
c931b16c1f
Merge branch 'master' into varregion
2013-11-04 22:12:57 -08:00
79b031bd0c
varregion: send region size in LLLoginResponse.
2013-11-02 15:42:26 -07:00
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
ff5885ab23
varregion: push TerrainData implementation up and down the database storage stack.
...
Implement both LoadTerrain and StoreTerrain for all DBs.
Move all database blob serialization/deserialization into TerrainData.
2013-11-01 11:35:31 -07:00
edaf0a98d6
Give the caller AddMapTile a valid reason response if this failed due to blank response from server or connection failure.
...
Raise log lines which indicate problems to warning from debug
2013-10-29 23:37:22 +00:00
86bf79aa2b
Merge branch 'master' into varregion
2013-10-07 13:58:17 -07:00
7416809077
varregion: plug in TerrainData class and modify TerrainModule and 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).
2013-10-07 13:57:40 -07:00
69054ad134
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-10-06 18:32:20 +01:00
42bdf44658
Bump OPenSimulator version and assembly versions up to 0.8.0 Dev
2013-10-04 23:33:47 +01:00
317c04fe17
VarRegion: change RegionInfo storage of region coordinates from region
...
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.
2013-09-28 07:33:52 -07:00
72206a0e29
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
2013-09-16 22:32:53 +01:00
528fc5358d
Fix exception when brokering HG asset ids
2013-09-08 18:23:06 +02:00
2f365ea80b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-09-07 13:54:19 +01:00
5f15ee95dc
Fix logic errors in "show grid users online" console command which didn't actually filter out users shown continuously online for more than 5 days
...
Remove confusion in command output.
2013-09-03 00:16:43 +01:00
4035badd20
Add experimental "show grid users online" console command to show grid users online from a standalone/robust instance.
...
This is not guaranteed to be accurate since users may be left "online" in certain situations.
For example, if a simulator crashes and they never login/logout again.
To counter this somewhat, only users continuously online for less than 5 days are shown.
2013-09-03 00:04:12 +01:00
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
008c98a974
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-09-01 22:49:31 +01:00
aa521fb385
Do not add a port zero to end of the hypergrid gateway host name.
...
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.
2013-08-28 16:38:07 -07:00
0dd9a68eb7
Revert "Make HG logins fall back to fallback regions if the desired region fails."
...
This is very similar to my earlier revert in bcb8605f84c7a8afbb8d
2013-08-26 21:07:49 +01:00
1b2830b929
Revert "Added some more debug messages."
...
Fallback doesn't work at this level as the change of destination isn't communicated to the source region/viewer
Reverting because this introduces a bug when access does fail.
More detail in revert of main commit.
This reverts commit ec32c1d4b6
2013-08-26 21:05:55 +01:00
ec32c1d4b6
Added some more debug messages.
2013-08-24 09:59:05 -07:00
5cd7bc2848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-24 03:42:39 -07:00
UbitUmarov