| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 1 | -1/+1 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | ||||
| | * | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 4 | -29/+42 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | minor: Add documentation to IGridService.GetRegionFlags() | Justin Clark-Casey (justincc) | 2012-10-09 | 1 | -0/+13 |
| | | | |||||
| | * | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it ↵ | Justin Clark-Casey (justincc) | 2012-10-09 | 3 | -29/+29 |
| | | | | | | | | | easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this. | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-10-07 | 1 | -16/+21 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | ||||
| | * | | Fix threading in remote asset connector | Melanie | 2012-10-05 | 1 | -16/+21 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-07 | 2 | -4/+15 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-10-04 | 2 | -4/+9 |
| | |\ \ | |||||
| | | * | | Make the asset retrieval concurrency a config switch. The current value | Mic Bowman | 2012-10-04 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | of 30 is still hanging badly on some mono versions. The switch defaults to 30 to preserve current behavior. | ||||
| | * | | | One more abstraction for GridUser so that it can be overridden in a sub-class. | Diva Canto | 2012-10-04 | 1 | -2/+7 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-10-03 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | ||||
| | * | | | string format arguments in wrong order | SignpostMarv | 2012-10-02 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-02 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | On more virtual method | Diva Canto | 2012-10-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Allow setting max connections for an endpoint | Melanie | 2012-09-30 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-30 | 1 | -12/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Revert "Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 5 | -9/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef. | ||||
| | * | | Added request.Proxy=null everywhere, as discussed in ↵ | Diva Canto | 2012-09-30 | 5 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html | ||||
| | * | | Made a method of GridUserService virtual so it can be overridden. | Diva Canto | 2012-09-30 | 1 | -12/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 2 | -11/+0 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | ||||
| | * | | Removed the bits about the TOSModule. That module doesn't go into core. ↵ | Diva Canto | 2012-09-27 | 2 | -11/+0 |
| | | | | | | | | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 1 | -37/+67 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Sequence/throttle asset retrievals. | Melanie | 2012-09-14 | 1 | -37/+67 |
| | | | | |||||
| * | | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster | Melanie | 2012-09-27 | 3 | -4/+37 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Use GridUser properly for foreign users. | Diva Canto | 2012-09-26 | 1 | -4/+27 |
| | | | | |||||
| | * | | TOS module. WARNING: migration in GridUser table. | Diva Canto | 2012-09-25 | 2 | -0/+10 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 3 | -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 Canto | 2012-09-22 | 1 | -3/+100 |
| | | | | | | | | | | | | | go. Domain-name and user-level based. \o/ | ||||
| | * | | More HG 2.0: access control at the Gatekeeper. \o/ | Diva Canto | 2012-09-21 | 1 | -8/+54 |
| | | | | |||||
| | * | | Minor: change the return value of unsuccessful posts to string.Empty. | Diva Canto | 2012-09-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | Improvement over last commit: refactor the asset permissions code, so that ↵ | Diva Canto | 2012-09-20 | 1 | -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 Canto | 2012-09-20 | 1 | -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 'avination' into careminster | Melanie | 2012-09-16 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | ||||
| | * | | Allow setting max connections for an endpoint | Melanie | 2012-09-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 2 | -6/+59 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-15 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | Add basic asset connector tests to check behaviour for normal, local and ↵ | Justin Clark-Casey (justincc) | 2012-09-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | temporary assets. Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods. | ||||
| | * | | | More on HG2.0: added the possibility of controlling the appearance that ↵ | Diva Canto | 2012-09-15 | 1 | -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 Canto | 2012-09-13 | 1 | -4/+56 |
| | | | | | | | | | | | | | outside world to retrieve appearance items. Not ACLed yet. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 3 | -43/+51 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Prevent double slashes, try #4 | UbitUmarov | 2012-09-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Prevent double slashes, try #3 | Melanie | 2012-09-06 | 1 | -0/+3 |
| | | | | |||||
| | * | | Revert "Change string concatenation to Path.Combine to eliminate extra slashes." | Melanie | 2012-09-06 | 1 | -8/+6 |
| | | | | | | | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9. | ||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-06 | 1 | -6/+8 |
| | |\ \ | |||||
| | | * | | Change string concatenation to Path.Combine to eliminate extra slashes. | Melanie | 2012-09-06 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | Windoze barfs on them. | ||||
| | | * | | Revert " remove extra '/' in assets url" | Melanie | 2012-09-06 | 1 | -13/+6 |
| | | | | | | | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486. | ||||
| | | * | | remove extra '/' in assets url | UbitUmarov | 2012-09-06 | 1 | -6/+13 |
| | | | | | |||||
| | * | | | Make friend notifies and closing child agents async because both can | Melanie | 2012-09-04 | 2 | -42/+47 |
| | |/ / | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |