aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-232-7/+14
|\ | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * 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.
| * 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
* | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-09-071-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Allow one to specify a DefaultHGRegion flag in [GridService] in order to ↵Justin Clark-Casey (justincc)2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2013-09-011-4/+8
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Revert "Make HG logins fall back to fallback regions if the desired region ↵Justin Clark-Casey (justincc)2013-08-261-24/+3
| | | | | | | | | | | | | | | | fails." This is very similar to my earlier revert in bcb8605f8428a9009a2badf9c9eed06d9f59962c and fails for the same reasons. Reverting this change because it causes a problem if access is denied to the user. This reverts commit c7a8afbb8da40e09252d58d95c89b8a99a684157.
| * Revert "Added some more debug messages."Justin Clark-Casey (justincc)2013-08-261-4/+1
| | | | | | | | | | | | | | | | 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 ec32c1d4b69e4219fe44a38bcbc411e7996641f1.
| * Added some more debug messages.Diva Canto2013-08-241-1/+4
| |
| * Make HG logins fall back to fallback regions if the desired region fails.Diva Canto2013-08-241-3/+24
| |
| * minor: Make logging in GatekeeperService.LoginAgent() a bit more detailed so ↵Justin Clark-Casey (justincc)2013-08-221-4/+8
| | | | | | | | that we can distinguish between simultaneous logins
| * Revert "Implement ability for hg logins to try fallback regions just like ↵Justin Clark-Casey (justincc)2013-08-221-39/+5
| | | | | | | | | | | | | | | | | | | | | | local logins." This approach does not work - it is taking place too far down the login process where really the region checking could only be done when the hg map tiles are linked on the main map (messy and probably impossible) or possibly when the final destination is fetched at the very first stage of teleport (which couldn't be done without a protocol change to pass the agentID as well as the requested regionID) This reverts commit 3d9b73c47a15cf00150ac80570fea88de8cecbdf.
| * Implement ability for hg logins to try fallback regions just like local logins.Justin Clark-Casey (justincc)2013-08-211-5/+39
| | | | | | | | | | These would be specified in the [GridService] section of Robust.HG.ini, which already lists these in the example text. Untested patch so that Neb can easily pull in for testing, though shouldn't disrupt existing hg logins since fallback processing is a bit of code stuck on the end of the login sequence.
* | Merge branch 'master' into careminsterMelanie2013-07-241-0/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Physics/Manager/PhysicsActor.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Better version of previous commitDiva Canto2013-07-211-2/+6
| |
| * Add the Current Outfit folder as an available folder in the SuitcaseInventory.Diva Canto2013-07-211-0/+16
| |
* | Merge branch 'master' into careminsterMelanie2013-07-184-92/+212
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Cleanup old hg sessions (older than 2 days)Diva Canto2013-07-141-0/+3
| |
| * HG UAS: Moved hg-session data from memory to DB storage. This makes it so ↵Diva Canto2013-07-142-90/+199
| | | | | | | | that traveling info survives Robust resets. It should also eliminate the cause of empty IP addresses in agent circuit data that we saw in CC grid. MySQL only.
| * Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No need to ↵Diva Canto2013-07-131-0/+6
| | | | | | | | bother the sim.
| * minor: remove mono compiler warnings from HGSuitcaseInventoryServiceJustin Clark-Casey (justincc)2013-07-091-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-06-231-6/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-211-6/+6
| |
* | Merge branch 'master' into careminsterMelanie2013-06-131-1/+23
|\ \ | |/
| * After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, ↵Justin Clark-Casey (justincc)2013-06-121-1/+23
| | | | | | | | | | | | | | consistently check for null return and log warning rather than throw exception. This was being done already in some places. If an exception is thrown it is now an error rather than debug
* | Merge branch 'master' into careminsterMelanie2013-04-291-4/+21
|\ \ | |/
| * Added an interface to an external ban service. With this commit, the ↵Diva Canto2013-04-271-4/+21
| | | | | | | | interface is used only in Hypergrided worlds (Gatekeeper), although in those, it applies to both local and foreign users. The Ban service itself is not in core; it is to be provided externally.
* | Merge branch 'master' into careminsterMelanie2013-02-284-4/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Switched to using the other Util function with a default value.Diva Canto2013-02-274-4/+8
| |
| * Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-274-4/+4
| | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | Merge branch 'master' into careminsterMelanie2013-02-234-4/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Added new Util function for reading config vars that's more generic than the ↵Diva Canto2013-02-224-4/+4
| | | | | | | | one I added yesterday -- this is for helping move config vars out of [Startup]
* | Merge branch 'master' into careminsterMelanie2013-02-225-11/+13
|\ \ | |/
| * Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-214-10/+12
| | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2012-12-041-10/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * Improvement in HGInstantMessageService: account for the existence of an ↵Diva Canto2012-12-041-10/+25
| | | | | | | | offline IM service.
* | Merge branch 'master' into careminsterMelanie2012-11-171-0/+33
|\ \ | |/
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-11-091-1/+22
|\ \ | |/
| * HG: Hopefully this fixes the issues with port 80 once and for all.Diva Canto2012-11-071-1/+22
| |
* | Merge branch 'master' into careminsterMelanie2012-11-041-0/+9
|\ \ | |/
| * HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder ↵Diva Canto2012-11-031-0/+9
| | | | | | | | with parentID=UUID.Zero
* | Merge branch 'master' into careminsterMelanie2012-11-031-5/+5
|\ \ | |/
| * HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ↵Diva Canto2012-11-021-5/+5
| | | | | | | | THESE.
* | Merge branch 'master' into careminsterMelanie2012-10-202-2/+2
|\ \ | |/
generated by cgit v1.1 at 2024-12-21 08:02:17 +0000