aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-273-4/+37
|\
| * Use GridUser properly for foreign users.Diva Canto2012-09-261-4/+27
| |
| * TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-252-0/+10
| |
* | 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 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Allow setting max connections for an endpointMelanie2012-09-141-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-162-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/opensimDiva Canto2012-09-151-2/+2
| |\ \
| | * | Add basic asset connector tests to check behaviour for normal, local and ↵Justin Clark-Casey (justincc)2012-09-151-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 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 'avination' into careminsterMelanie2012-09-103-43/+51
|\ \ \ | | |/ | |/|
| * | Prevent double slashes, try #4UbitUmarov2012-09-061-1/+1
| | |
| * | Prevent double slashes, try #3Melanie2012-09-061-0/+3
| | |
| * | Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
| | | | | | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9.
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-061-6/+8
| |\ \
| | * | Change string concatenation to Path.Combine to eliminate extra slashes.Melanie2012-09-061-6/+8
| | | | | | | | | | | | | | | | Windoze barfs on them.
| | * | Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
| | | | | | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486.
| | * | remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
| | | |
| * | | Make friend notifies and closing child agents async because both canMelanie2012-09-042-42/+47
| |/ / | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive
* | | Merge branch 'master' into careminsterMelanie2012-09-091-2/+2
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | 4096 is used in various places as the maximum height of a region, ↵SignpostMarv2012-09-081-2/+2
| | | | | | | | | | | | refactoring to be a constant
* | | Merge branch 'avination' into careminsterMelanie2012-08-314-3/+5
|\ \ \ | | |/ | |/|
| * | fix vs2010 buildUbitUmarov2012-08-164-3/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-291-1/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵Justin Clark-Casey (justincc)2012-08-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch.
* | | Merge branch 'master' into careminsterMelanie2012-08-251-25/+28
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-251-15/+49
| |\ \
| * | | Fix and refactor region registration. Reorder checks to short-curcuit ↵Melanie2012-08-251-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | expensive and destructive ones. Properly fix region reservation and authentication. Make region moves and flags preservation work again as intended. Prevent failes reservation take-over from damging reservation data.
* | | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-15/+49
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ↵Justin Clark-Casey (justincc)2012-08-251-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | calling cards) to be created in the base "My Inventory" user folder. This is to accomodate situations where viewers will create more than one 'type' subfolder (e.g. calling cards) But at the same time to prevent multiple such 'system' folders (those in the base "My Inventory" user folder). This also makes GetFolderForType() only return a folder in the base "My Inventory" folder, if such a type folder exists
| * | Allow multiple calling card type inventory folders to be created.Justin Clark-Casey (justincc)2012-08-251-0/+1
| |/ | | | | | | Modern viewers want to create Friends and All folders of this type inside the root Calling Cards folder.
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+14
| |
* | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-158-6/+58
| | | | | | | | script needs this for proper logging.
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+15
| |
* | Merge branch 'careminster' into avinationMelanie2012-08-141-1/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * \ Merge branch 'master' into careminsterMelanie2012-08-141-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Exclude temp attachemnts from being sent to the avatar serviceMelanie2012-08-141-1/+2
| | |
* | | Merge branch 'careminster' into avinationMelanie2012-08-032-2/+4
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2012-08-032-2/+4
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * minor: Comment out "Deleting asset" log messages for nowJustin Clark-Casey (justincc)2012-08-032-2/+4
| | |
* | | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
|/ /
* | Merge branch 'master' into careminsterMelanie2012-08-011-9/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Change exception log messages in XInventoryService connector to error rather ↵Justin Clark-Casey (justincc)2012-08-011-9/+8
| | | | | | | | | | | | than debug, since these signal real problems. Also outputs full exception instead of just the message to aid diagnostics.
* | Merge branch 'master' into careminsterMelanie2012-08-011-1/+1
|\ \ | |/
generated by cgit v1.1 at 2024-12-23 19:20:38 +0000