Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 21 | -101/+107 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-01-18 | 22 | -106/+108 |
| |\ | |||||
| | * | Put the 'new' back to avoid a warning. Yes, we want to hide it. | Diva Canto | 2011-01-17 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-01-17 | 20 | -84/+72 |
| | |\ | |||||
| | | * | force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ↵ | dahlia | 2011-01-17 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | packet | ||||
| | | * | minor: resolve some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 5 | -7/+8 |
| | | | | |||||
| | | * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 7 | -12/+12 |
| | | | | | | | | | | | | | | | | Didn't touch the appearance related stuff. | ||||
| | | * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 4 | -11/+11 |
| | | | | |||||
| | | * | Reduce amount of debug lopgging put out by some simiangrid connectors. ↵ | Justin Clark-Casey (justincc) | 2011-01-18 | 4 | -21/+20 |
| | | | | | | | | | | | | | | | | Please re-enable if needed. | ||||
| | | * | refactor: remove redundant null checks | Justin Clark-Casey (justincc) | 2011-01-17 | 1 | -30/+15 |
| | | | | |||||
| | | * | Fix UnackedBytes client stack statistic as seen in "show queues" | Justin Clark-Casey (justincc) | 2011-01-17 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | Bytes were being wrongly added again on a resend | ||||
| | * | | Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, ↵ | Diva Canto | 2011-01-17 | 1 | -8/+0 |
| | |/ | | | | | | | | | | because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-01-17 | 1 | -2/+0 |
| | |\ | |||||
| | | * | objectId in AvatarAnimation packet should be UUID.Zero for non-overridden ↵ | dahlia | 2011-01-17 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | animations | ||||
| | * | | Revert "DEBUG DEBUG DEBUG" | Diva Canto | 2011-01-17 | 2 | -5/+1 |
| | |/ | | | | | | | | | | This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5. | ||||
| | * | DEBUG DEBUG DEBUG | Diva Canto | 2011-01-17 | 2 | -1/+5 |
| | | | |||||
| | * | Protect World Map module, RequestMapItemsAsync, from badly formed URLs. | Diva Canto | 2011-01-17 | 1 | -1/+11 |
| | | | |||||
| | * | Account for some component along the way lower-casing the HTTP header keys. ↵ | Diva Canto | 2011-01-17 | 2 | -21/+23 |
| | | | | | | | | | | | | (XFF header issue) | ||||
| | * | Brute force debug for XFF issue | Diva Canto | 2011-01-17 | 1 | -0/+7 |
| | | | |||||
| | * | More debug messages to help track the XFF header problem. | Diva Canto | 2011-01-17 | 2 | -0/+5 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Prevent activation and deactivation of gestures from clobbering the slam | Melanie | 2011-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | bits | ||||
| * | | Change gesture activation to not quash any other flags | Melanie | 2011-01-18 | 1 | -3/+3 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Fix slam bits being lost when editing perms in prim inventory | Melanie | 2011-01-14 | 1 | -1/+0 |
| | | |||||
* | | Prevent activation and deactivation of gestures from clobbering the slam | Melanie | 2011-01-18 | 1 | -1/+1 |
| | | | | | | | | bits | ||||
* | | Change gesture activation to not quash any other flags | Melanie | 2011-01-17 | 1 | -3/+3 |
| | | |||||
* | | Add a new ViewObjectInventory permission to decouple viewing from | Melanie | 2011-01-14 | 1 | -0/+17 |
| | | | | | | | | +MOD status | ||||
* | | Revert "Replace the new, tricky MySql.Data.dll with the older version from ↵ | Melanie | 2011-01-14 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | 0.6.9" This reverts commit e5ce59ff34351612980e70a25ed978dd90ebe593. The old module causes a truly massive (double!) rise in connections. Please put "old guids=true;" back in after this commit | ||||
* | | Revert "Remove old guids from the examples, for completeness' sake" | Melanie | 2011-01-14 | 3 | -4/+4 |
| | | | | | | | | This reverts commit 52222d82d50cbeb7f709142e37421c6cef490706. | ||||
* | | Temporarily reinstate prim counting in the update loop to make the production | Melanie | 2011-01-14 | 1 | -7/+7 |
| | | | | | | | | systems run | ||||
* | | Implement nonlocal god kicks and freezes | Melanie | 2011-01-14 | 1 | -4/+35 |
| | | |||||
* | | Fix slam bits being lost when editing perms in prim inventory | Melanie | 2011-01-14 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-13 | 4 | -66/+163 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-13 | 2 | -4/+22 |
| |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * \ | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2011-01-13 | 5 | -25/+79 |
| | |\ \ | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M. | Kitto Flora | 2011-01-13 | 2 | -4/+22 |
| | | | | | |||||
| * | | | | Implement kicking, freezing and unfreezing users in the same sim via | Melanie | 2011-01-13 | 1 | -58/+117 |
| | | | | | | | | | | | | | | | | | | | | profile god buttons. | ||||
| * | | | | Guard against invalid light color specifiers from the database | Melanie | 2011-01-13 | 1 | -4/+24 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-13 | 3 | -5/+24 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Make FireAndForgetWrapper a singleton class | BlueWall | 2011-01-13 | 3 | -5/+24 |
| | | | | | | | | | | | | | | | | | | Made FireAndForgetWrapper a singleton class to allow us to drop dependancy on the BclExtras35 library. BclExtras is broken in Mono 2.8.2 and we used the library in only one function. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-12 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Dont' trust the viewer! Fix a permission slam error caused by trusting | Melanie | 2011-01-12 | 2 | -1/+6 |
| | | | | | | | | | | | | the viewer too much. | ||||
| * | | Fix direct item give permissions | Melanie | 2011-01-12 | 5 | -23/+73 |
| | | | |||||
| * | | Use ToString() rather than a cast (more robust) | Melanie | 2011-01-12 | 1 | -1/+1 |
| | | | |||||
| * | | Partial permissions fix for boxed items. | Melanie | 2011-01-12 | 2 | -0/+17 |
| | | | |||||
| * | | Fix god mode perms adjustment | Melanie | 2011-01-12 | 1 | -0/+2 |
| | | | |||||
| * | | Improved debug messages to track what is going on with the XFF header | Diva Canto | 2011-01-09 | 3 | -5/+11 |
| | | | |||||
| * | | Added more debug messages under the -verbose option. | Diva Canto | 2011-01-08 | 1 | -2/+6 |
| | | | |||||
| * | | Added a -v|verbose option to save iar. | Diva Canto | 2011-01-08 | 2 | -1/+9 |
| | | |