Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2010-01-09 | 2 | -3/+8 |
|\ | |||||
| * | Adds config option "ForwardOfflineGroupMessages" to allow disabling of group ↵ | dahlia | 2010-01-07 | 1 | -1/+6 |
| | | | | | | | | messages forwarded while offline. Addresses Mantis #4457 | ||||
| * | Fixes the newly added packets as per Melanie's request. | Revolution | 2010-01-07 | 1 | -2/+2 |
| | | | | | | | | | | | | Provisionally applied to fix the naming. Signatures are still subject to change. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 4 | -23/+23 |
|\ \ | |/ | |||||
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 4 | -23/+23 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 1 | -0/+23 |
|\ \ | |/ | |||||
| * | Adds Friend Finding functionality. | Revolution | 2009-12-31 | 1 | -0/+23 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-25 | 1 | -0/+13 |
|\ \ | |/ | |||||
| * | Enable the profile module to be replaced completely, even for the base | Melanie | 2009-12-25 | 1 | -0/+13 |
| | | | | | | | | profile data | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 1 | -1/+12 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-23 | 1 | -1/+7 |
| |\ | |||||
| | * | Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the ↵ | Diva Canto | 2009-12-22 | 1 | -1/+7 |
| | | | | | | | | | | | | stream can be closed. | ||||
| * | | Fix a bounds exception I came across in IAR restore | Melanie | 2009-12-23 | 1 | -0/+5 |
| |/ | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-28 | 1 | -27/+44 |
|\ \ | |/ | |||||
| * | Implement god mode user freezing and unfreezing | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -27/+44 |
| | | | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=4356 Thanks Revolution I performed a subsequent probable bug fix in this patch | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-26 | 3 | -2/+17 |
|\ \ | |/ | |||||
| * | Resolve issue where an iar load fails to preserve original item creators | Justin Clark-Casey (justincc) | 2009-11-26 | 3 | -2/+17 |
| | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=4394 This change preserves the uuid when a profile is found rather than the ospa | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-25 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Change chat config code so that enabled = false actually does disable the ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -2/+3 |
| | | | | | | | | chat module | ||||
| * | minor: remove some mono compiler warnings, add --merge load oar switch to ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -1/+0 |
| | | | | | | | | help information | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-25 | 3 | -65/+79 |
|\ \ | |/ | |||||
| * | Make load/save iar slightly better in the face of io failures by always ↵ | Justin Clark-Casey (justincc) | 2009-11-24 | 2 | -63/+77 |
| | | | | | | | | attempting to close the streams | ||||
| * | minor: remove experimental tags from load iar and save iar commands | Justin Clark-Casey (justincc) | 2009-11-24 | 1 | -2/+2 |
| | | |||||
* | | Append a prefix to the god avatar names appearing in chat whilst in god mode ↵ | CasperW | 2009-11-24 | 1 | -3/+8 |
| | | | | | | | | (disabled by default, config entry admin_prefix) | ||||
* | | Removed some extra debug chatter | CasperW | 2009-11-24 | 1 | -1/+1 |
| | | |||||
* | | Fixed nullrefs | CasperW | 2009-11-23 | 1 | -19/+23 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-23 | 5 | -18/+18 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-11-23 | 5 | -18/+18 |
| | | |||||
* | | Prevent a nullref if a recipient of a group message gas left the scene | Melanie | 2009-11-15 | 1 | -12/+15 |
|/ | |||||
* | minor: A further minor tweak to reduce iar load logging verbosity | Justin Clark-Casey (justincc) | 2009-11-13 | 1 | -2/+2 |
| | |||||
* | refactor some test asset creation into a helper class | Justin Clark-Casey (justincc) | 2009-11-12 | 1 | -8/+2 |
| | | | | remove mono compiler warning | ||||
* | minor: for now stop iar tests spewing log messages when running testsuite | Justin Clark-Casey (justincc) | 2009-11-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-11-09 | 2 | -7/+6 |
|\ | |||||
| * | Fixing the build break | John Hurliman | 2009-11-06 | 1 | -2/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-11-05 | 3 | -11/+119 |
| |\ | |||||
| * | | Changing the AssetBase constructors to avoid initializing assets with an ↵ | John Hurliman | 2009-11-05 | 2 | -5/+5 |
| | | | | | | | | | | | | unknown asset type, and log an error if it ever does happen | ||||
* | | | refactor out iar escaping | Justin Clark-Casey (justincc) | 2009-11-09 | 3 | -17/+26 |
| | | | |||||
* | | | minor: correct slightly over-enthusiastic load iar logging message | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -2/+1 |
| | | | |||||
* | | | fix load iar regression accidentally introduced in last commit | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -1/+1 |
| | | | |||||
* | | | minor: tweak load iar messages to be slightly less verbose | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -4/+5 |
| | | | |||||
* | | | minor: provide updates on number of assets loaded while executing "load iar" | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -2/+9 |
| | | | |||||
* | | | refactor: break actual item load in iar into separate method | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -28/+46 |
| | | | |||||
* | | | minor: remove some old commented out load iar code | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -30/+0 |
| | | | |||||
* | | | Tell the user when a 'save iar' has failed because the inventory path could ↵ | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -53/+21 |
| | | | | | | | | | | | | not be found | ||||
* | | | Implement human / escaping for inventory folders as well as items | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -1/+5 |
| | | | |||||
* | | | refactor path delimiter in iar utils | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -5/+7 |
| | | | |||||
* | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -1/+1 |
| | | | |||||
* | | | refactor: make human iar escape char a constant rather than a magic char | Justin Clark-Casey (justincc) | 2009-11-09 | 1 | -3/+5 |
| | | | |||||
* | | | * for iars, allow item names/folders including "/" to be escaped using "\/" | Justin Clark-Casey (justincc) | 2009-11-09 | 2 | -4/+87 |
| |/ |/| | | | | | | | * also, "\" has to be escaped as "\\" * add item name unit test for escaped characters | ||||
* | | add unit test for iar & escaping | Justin Clark-Casey (justincc) | 2009-11-05 | 1 | -2/+94 |
| | |