aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Improve efficiency of friends notification by only make one PresenceService ↵Justin Clark-Casey (justincc)2012-10-202-2/+2
| | | | | | | | | | | | call for all friends rather than one for each friend. However, large groups could still take a very long time since we still need to message each avatar on different simulators.
* | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-271-4/+27
|\ \ | |/
| * Use GridUser properly for foreign users.Diva Canto2012-09-261-4/+27
| |
* | Merge branch 'master' into careminsterMelanie2012-09-243-14/+177
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * HG 2.0: User Agent Service now can also control where the local users can ↵Diva Canto2012-09-221-3/+100
| | | | | | | | go. Domain-name and user-level based. \o/
| * More HG 2.0: access control at the Gatekeeper. \o/Diva Canto2012-09-211-8/+54
| |
| * Minor: change the return value of unsuccessful posts to string.Empty.Diva Canto2012-09-211-1/+1
| |
| * Improvement over last commit: refactor the asset permissions code, so that ↵Diva Canto2012-09-201-58/+5
| | | | | | | | it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive
| * More HG2.0: Added permission policies in HGAsset Service based on asset ↵Diva Canto2012-09-201-3/+76
| | | | | | | | types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next.
* | Merge branch 'master' into careminsterMelanie2012-09-161-4/+57
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * More on HG2.0: added the possibility of controlling the appearance that ↵Diva Canto2012-09-151-0/+1
| | | | | | | | avies use to visit other grids. Not as good as I wanted, but good enough. Unfortunately we can't switch the appearance from under the avie without getting into a lot of weirdnesses because appearance is viewer-controlled. So instead, when this control is on, I'm disallowing HG-TP unless the user is wearing an allowed HG appearance -- the user gets a warning and needs to switch appearance. WARNING: I'm still not committing the config vars because this is still not ready for ppl to test.
| * Restarting to work on HGSuitcaseInventoryService: added the ability for the ↵Diva Canto2012-09-131-4/+56
| | | | | | | | outside world to retrieve appearance items. Not ACLed yet.
* | Merge branch 'master' into careminsterMelanie2012-07-013-17/+15
|\ \ | |/
| * Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-303-17/+15
| |
* | Merge branch 'master' into careminsterMelanie2012-04-081-50/+56
|\ \ | |/
generated by cgit v1.1 at 2024-10-28 23:45:48 +0000