aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
|\ \ | |/
| * If we're fetching active gestures via the XInventoryServiceConnector, then ↵Justin Clark-Casey (justincc)2012-07-301-1/+1
| | | | | | | | properly look at the ITEMS dictionary already returned rather than the level above this.
* | Merge branch 'avination' into careminsterMelanie2012-07-161-5/+29
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | be paranoic (?)UbitUmarov2012-07-111-0/+6
| | |
| * | Replace a Multicast Delegate by a simple list of delegates in access GetUbitUmarov2012-07-111-5/+23
| | | | | | | | | | | | | | | Can't seen more than one evocation on the multicast on this case, even expanding its evocation list (as it should be used in case one fails). With the list i do see what we want.
* | | Merge branch 'master' into careminsterMelanie2012-07-131-2/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-131-2/+1
| | | | | | | | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
* | | Merge branch 'master' into careminsterMelanie2012-07-051-13/+43
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: add client name to various login service log messages to disambiguate ↵Justin Clark-Casey (justincc)2012-07-051-13/+43
| | | | | | | | | | | | | | | | | | messages from concurrent logins. Also adds destination resolution debug log message showing region endpoint. Adding endpoint to the log helps to find issues where the region external host information has been wrongly configured
* | | Merge branch 'master' into careminsterMelanie2012-07-014-27/+15
|\ \ \ | |/ /
| * | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-303-17/+15
| | |
| * | Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-10/+0
| | | | | | | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
* | | Merge branch 'master' into careminsterMelanie2012-06-281-22/+118
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Show region positions in "show regions" robust console commandJustin Clark-Casey (justincc)2012-06-261-1/+7
| | |
| * | minor: correct GridService "show regions" cibsike cinnabd usage statementJustin Clark-Casey (justincc)2012-06-261-1/+1
| | |
| * | Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.Justin Clark-Casey (justincc)2012-06-261-6/+5
| | | | | | | | | | | | Use these for new "show regions" command rather than old cumbersome stuff.
| * | Add "show regions" console command to ROBUST to show all regions currently ↵Justin Clark-Casey (justincc)2012-06-261-0/+44
| | | | | | | | | | | | | | | | | | registered. Command is not added in standalone, which has its own version of "show regions" that can also show estate name
| * | Add "show region at" command to grid service to get the details of a region ↵Justin Clark-Casey (justincc)2012-06-251-22/+69
| | | | | | | | | | | | | | | | | | | | | at a specific location. "show region" command becomes "show region name" to disambiguate This is the same format as used by "show object name", etc. "deregister region" also becomes "deregister region id"
* | | Merge branch 'master' into careminsterMelanie2012-06-141-0/+45
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
generated by cgit v1.1 at 2024-12-23 15:56:22 +0000