aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-251-25/+28
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-251-15/+49
| |\
| * | Fix and refactor region registration. Reorder checks to short-curcuit expensi...Melanie2012-08-251-25/+28
* | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-15/+49
|\ \ \ | | |/ | |/|
| * | Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ca...Justin Clark-Casey (justincc)2012-08-251-16/+49
| * | Allow multiple calling card type inventory folders to be created.Justin Clark-Casey (justincc)2012-08-251-0/+1
| |/
| * 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
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+15
* | Merge branch 'careminster' into avinationMelanie2012-08-141-1/+2
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-08-141-1/+2
| |\ \ | | |/
| | * 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
| |\ \ | | |/
| | * 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
|\ \ | |/
| * Change exception log messages in XInventoryService connector to error rather ...Justin Clark-Casey (justincc)2012-08-011-9/+8
* | Merge branch 'master' into careminsterMelanie2012-08-011-1/+1
|\ \ | |/
| * If we're fetching active gestures via the XInventoryServiceConnector, then pr...Justin Clark-Casey (justincc)2012-07-301-1/+1
* | Merge branch 'avination' into careminsterMelanie2012-07-161-5/+29
|\ \
| * | be paranoic (?)UbitUmarov2012-07-111-0/+6
| * | Replace a Multicast Delegate by a simple list of delegates in access GetUbitUmarov2012-07-111-5/+23
* | | Merge branch 'master' into careminsterMelanie2012-07-131-2/+1
|\ \ \ | | |/ | |/|
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-131-2/+1
* | | Merge branch 'master' into careminsterMelanie2012-07-051-13/+43
|\ \ \ | |/ /
| * | minor: add client name to various login service log messages to disambiguate ...Justin Clark-Casey (justincc)2012-07-051-13/+43
* | | 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
* | | Merge branch 'master' into careminsterMelanie2012-06-281-22/+118
|\ \ \ | |/ /
| * | 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
| * | Add "show regions" console command to ROBUST to show all regions currently re...Justin Clark-Casey (justincc)2012-06-261-0/+44
| * | Add "show region at" command to grid service to get the details of a region a...Justin Clark-Casey (justincc)2012-06-251-22/+69
* | | Merge branch 'master' into careminsterMelanie2012-06-141-0/+45
|\ \ \ | |/ /
| * | Add "deregister region" by uuid command to grid service to allow manual dereg...Justin Clark-Casey (justincc)2012-06-131-0/+45
* | | Merge branch 'master' into careminsterMelanie2012-06-121-21/+7
|\ \ \ | |/ /
| * | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-121-21/+7
* | | Merge branch 'avination' into careminsterMelanie2012-06-111-0/+4
|\ \ \ | | |/ | |/|
| * | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-071-0/+5
* | | Merge branch 'master' into careminsterMelanie2012-06-031-1/+1
|\ \ \ | | |/ | |/|
| * | Fix various issues with http inventoryJustin Clark-Casey (justincc)2012-06-021-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-06-021-7/+10
|\ \ \ | | |/ | |/|
| * | Fix impersonation, it got broken in a mergeMelanie2012-06-011-7/+10
* | | Merge branch 'master' into careminsterMelanie2012-05-275-30/+78
|\ \ \ | | |/ | |/|
| * | Fix bug where a failed QueryAccess to a remove region would always have the r...Justin Clark-Casey (justincc)2012-05-251-13/+20
| * | In remote QueryAccess, also receive the actual status (true|false) instead of...Justin Clark-Casey (justincc)2012-05-251-0/+4
| * | Make ISimulationScene.GetScene() used the more efficient region id for lookup...Justin Clark-Casey (justincc)2012-05-242-2/+12