| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 2 | -4/+6 |
|\ |
|
| * | If an asset upload transaction doesn't exist for a CreateInventory request, | Melanie | 2012-09-24 | 2 | -7/+9 |
* | | Fix very recently introduced race condition where a CreateNewItem outracing a... | Justin Clark-Casey (justincc) | 2012-09-27 | 1 | -19/+18 |
* | | Comment out old m_storeLocal from AssetXferUploader. | Justin Clark-Casey (justincc) | 2012-09-27 | 1 | -6/+6 |
* | | Insert transaction ID into AssetXferUploader constructor rather than at Uploa... | Justin Clark-Casey (justincc) | 2012-09-27 | 2 | -36/+49 |
* | | Move UDP update task item code to AssetXferUploader to match existing create ... | Justin Clark-Casey (justincc) | 2012-09-27 | 3 | -50/+52 |
* | | Fix occasional race condition failure when creating new clothing/body parts i... | Justin Clark-Casey (justincc) | 2012-09-27 | 3 | -110/+93 |
|/ |
|
* | Fix slow loading of task inventory | Melanie | 2012-07-19 | 1 | -4/+7 |
* | Merge branch 'master' into careminster | Melanie | 2012-06-07 | 1 | -8/+7 |
|\ |
|
| * | Record the fact that child agents can have asset transactions. | Justin Clark-Casey (justincc) | 2012-06-07 | 1 | -8/+7 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 1 | -1/+21 |
|\ \
| |/ |
|
| * | User level based restrictions for HyperGrid teleports, asset uploads, group c... | Snoopy Pfeffer | 2012-03-27 | 1 | -1/+21 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -11/+24 |
|\ \
| |/ |
|
| * | Improve "j2k decode" command to tell us how many layers and components were d... | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -5/+16 |
| * | Add a "j2k decode" region console command that allows a manual request for a ... | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -8/+10 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -0/+4 |
|\ \
| |/ |
|
| * | Minor formatting changes and commented out log lines for future debugging of ... | Justin Clark-Casey (justincc) | 2012-01-04 | 1 | -0/+4 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -0/+3 |
|\ \
| |/ |
|
| * | Adding commented out log messages and some minor formatting for future bug hu... | Justin Clark-Casey (justincc) | 2012-01-02 | 1 | -0/+3 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -2/+0 |
|\ \
| |/ |
|
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -2/+0 |
* | | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 3 | -98/+238 |
|\ \
| |/ |
|
| * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 3 | -82/+238 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 1 | -256/+0 |
|\ \
| |/ |
|
| * | Moved several cap-based-service-providing modules from where they were into a... | Diva Canto | 2011-04-30 | 1 | -255/+0 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -4/+5 |
|\ \
| |/ |
|
| * | Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim. | Justin Clark-Casey (justincc) | 2011-04-28 | 1 | -4/+5 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -1/+26 |
|\ \
| |/ |
|
| * | Fixed Caps handlers leak | Diva Canto | 2011-02-05 | 1 | -1/+0 |
| * | One more diagnosis command: | Diva Canto | 2011-02-05 | 1 | -1/+27 |
* | | Add a "useCached" parameter to GetUserAccount. Add a function to Scene to get... | Tom | 2011-01-26 | 1 | -6/+1 |
* | | Add userFlags check to isBanned. This checks bans against DenyAnonymous and D... | Tom | 2011-01-26 | 1 | -1/+7 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 1 | -6/+6 |
|\ \
| |/ |
|
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -2/+2 |
| * | implement "show throttles" command for showing current agent throttles and th... | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -200/+0 |
| * | minor: help text adjustment for "show queues" | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -2/+2 |
| * | remove reference to CoreModules from ClientStack.LindenUDP | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -2/+2 |
| * | Move "show queues" command out of OpenSim.cs and into a separate module. | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -0/+200 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-25 | 1 | -80/+14 |
|\ \
| |/ |
|
| * | One more pass at object inventory. This time, fix SceneObjectPartInventory so... | Diva Canto | 2010-12-24 | 1 | -80/+14 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-24 | 1 | -35/+49 |
|\ \
| |/ |
|
| * | Hopefully this fixes all prim inventory issues. No more abort, no more keepin... | Diva Canto | 2010-12-23 | 1 | -35/+49 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 4 | -866/+0 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-23 | 1 | -6/+5 |
| |\ |
|
| * | | Removed unused code -- this was the previous version of UDP texture sending, ... | Diva Canto | 2010-12-23 | 4 | -866/+0 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -6/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | Put back a commented section of code. With some viewers, object inventory | Melanie | 2010-12-23 | 1 | -6/+5 |
| |/ |
|
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -16/+42 |
|\ \
| |/ |
|