| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-08-25 | 1 | -25/+28 |
|\ |
|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-25 | 1 | -15/+49 |
| |\ |
|
| * | | Fix and refactor region registration. Reorder checks to short-curcuit expensi... | Melanie | 2012-08-25 | 1 | -25/+28 |
* | | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster | Melanie | 2012-08-25 | 1 | -15/+49 |
|\ \ \
| | |/
| |/| |
|
| * | | Following on from f8a89a79, do not allow more than one 'type' folder (e.g. ca... | Justin Clark-Casey (justincc) | 2012-08-25 | 1 | -16/+49 |
| * | | Allow multiple calling card type inventory folders to be created. | Justin Clark-Casey (justincc) | 2012-08-25 | 1 | -0/+1 |
| |/ |
|
| * | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 1 | -0/+14 |
* | | Add a real_id field to the login response if impersonation is used. The wrapper | Melanie | 2012-08-15 | 8 | -6/+58 |
* | | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 1 | -0/+15 |
* | | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 1 | -1/+2 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -1/+2 |
| |\ \
| | |/ |
|
| | * | Exclude temp attachemnts from being sent to the avatar service | Melanie | 2012-08-14 | 1 | -1/+2 |
* | | | Merge branch 'careminster' into avination | Melanie | 2012-08-03 | 2 | -2/+4 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 2 | -2/+4 |
| |\ \
| | |/ |
|
| | * | minor: Comment out "Deleting asset" log messages for now | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -2/+4 |
* | | | Add a reason message for a code path that lacks one | Melanie | 2012-08-03 | 1 | -0/+1 |
|/ / |
|
* | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 1 | -9/+8 |
|\ \
| |/ |
|
| * | Change exception log messages in XInventoryService connector to error rather ... | Justin Clark-Casey (justincc) | 2012-08-01 | 1 | -9/+8 |
* | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | If we're fetching active gestures via the XInventoryServiceConnector, then pr... | Justin Clark-Casey (justincc) | 2012-07-30 | 1 | -1/+1 |
* | | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 1 | -5/+29 |
|\ \ |
|
| * | | be paranoic (?) | UbitUmarov | 2012-07-11 | 1 | -0/+6 |
| * | | Replace a Multicast Delegate by a simple list of delegates in access Get | UbitUmarov | 2012-07-11 | 1 | -5/+23 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-13 | 1 | -2/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Rather than instantiating a UTF8 encoding everywhere when we want to supress ... | Justin Clark-Casey (justincc) | 2012-07-13 | 1 | -2/+1 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-05 | 1 | -13/+43 |
|\ \ \
| |/ / |
|
| * | | minor: add client name to various login service log messages to disambiguate ... | Justin Clark-Casey (justincc) | 2012-07-05 | 1 | -13/+43 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-01 | 4 | -27/+15 |
|\ \ \
| |/ / |
|
| * | | Remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-06-30 | 3 | -17/+15 |
| * | | Removing unused handling of incoming create object by userID and itemID only. | Justin Clark-Casey (justincc) | 2012-06-30 | 1 | -10/+0 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-28 | 1 | -22/+118 |
|\ \ \
| |/ / |
|
| * | | Show region positions in "show regions" robust console command | Justin Clark-Casey (justincc) | 2012-06-26 | 1 | -1/+7 |
| * | | minor: correct GridService "show regions" cibsike cinnabd usage statement | Justin Clark-Casey (justincc) | 2012-06-26 | 1 | -1/+1 |
| * | | Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods. | Justin Clark-Casey (justincc) | 2012-06-26 | 1 | -6/+5 |
| * | | Add "show regions" console command to ROBUST to show all regions currently re... | Justin Clark-Casey (justincc) | 2012-06-26 | 1 | -0/+44 |
| * | | Add "show region at" command to grid service to get the details of a region a... | Justin Clark-Casey (justincc) | 2012-06-25 | 1 | -22/+69 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-14 | 1 | -0/+45 |
|\ \ \
| |/ / |
|
| * | | Add "deregister region" by uuid command to grid service to allow manual dereg... | Justin Clark-Casey (justincc) | 2012-06-13 | 1 | -0/+45 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-12 | 1 | -21/+7 |
|\ \ \
| |/ / |
|
| * | | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather... | Justin Clark-Casey (justincc) | 2012-06-12 | 1 | -21/+7 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-06-11 | 1 | -0/+4 |
|\ \ \
| | |/
| |/| |
|
| * | | Add the ability to query the MYSQL databse for a list of the stored prim UUIDs | Melanie | 2012-06-07 | 1 | -0/+5 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-06-03 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix various issues with http inventory | Justin Clark-Casey (justincc) | 2012-06-02 | 1 | -1/+1 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-06-02 | 1 | -7/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix impersonation, it got broken in a merge | Melanie | 2012-06-01 | 1 | -7/+10 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-27 | 5 | -30/+78 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix bug where a failed QueryAccess to a remove region would always have the r... | Justin Clark-Casey (justincc) | 2012-05-25 | 1 | -13/+20 |
| * | | In remote QueryAccess, also receive the actual status (true|false) instead of... | Justin Clark-Casey (justincc) | 2012-05-25 | 1 | -0/+4 |
| * | | Make ISimulationScene.GetScene() used the more efficient region id for lookup... | Justin Clark-Casey (justincc) | 2012-05-24 | 2 | -2/+12 |