aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-01-182-2/+2
|\
| * Fix build breakMelanie2011-01-181-1/+1
| * Also fix MySQLXInventoryDataMelanie2011-01-181-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-1821-101/+107
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-01-1822-106/+108
| |\
| | * Put the 'new' back to avoid a warning. Yes, we want to hide it.Diva Canto2011-01-171-1/+1
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-01-1720-84/+72
| | |\
| | | * force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ...dahlia2011-01-171-1/+4
| | | * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2011-01-185-7/+8
| | | * Prune some of the excess logging for client logins.Justin Clark-Casey (justincc)2011-01-187-12/+12
| | | * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2011-01-184-11/+11
| | | * Reduce amount of debug lopgging put out by some simiangrid connectors. Pleas...Justin Clark-Casey (justincc)2011-01-184-21/+20
| | | * refactor: remove redundant null checksJustin Clark-Casey (justincc)2011-01-171-30/+15
| | | * Fix UnackedBytes client stack statistic as seen in "show queues"Justin Clark-Casey (justincc)2011-01-172-3/+3
| | * | Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec...Diva Canto2011-01-171-8/+0
| | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-01-171-2/+0
| | |\
| | | * objectId in AvatarAnimation packet should be UUID.Zero for non-overridden ani...dahlia2011-01-171-2/+0
| | * | Revert "DEBUG DEBUG DEBUG"Diva Canto2011-01-172-5/+1
| | |/
| | * DEBUG DEBUG DEBUGDiva Canto2011-01-172-1/+5
| | * Protect World Map module, RequestMapItemsAsync, from badly formed URLs.Diva Canto2011-01-171-1/+11
| | * Account for some component along the way lower-casing the HTTP header keys. (...Diva Canto2011-01-172-21/+23
| | * Brute force debug for XFF issueDiva Canto2011-01-171-0/+7
| | * More debug messages to help track the XFF header problem.Diva Canto2011-01-172-0/+5
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-180-0/+0
|\ \ \ | |/ /
| * | Prevent activation and deactivation of gestures from clobbering the slamMelanie2011-01-181-1/+1
| * | Change gesture activation to not quash any other flagsMelanie2011-01-181-3/+3
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-180-0/+0
|\ \ | |/
| * Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
* | Prevent activation and deactivation of gestures from clobbering the slamMelanie2011-01-181-1/+1
* | Change gesture activation to not quash any other flagsMelanie2011-01-171-3/+3
* | Add a new ViewObjectInventory permission to decouple viewing fromMelanie2011-01-141-0/+17
* | Revert "Replace the new, tricky MySql.Data.dll with the older version from 0....Melanie2011-01-141-0/+0
* | Revert "Remove old guids from the examples, for completeness' sake"Melanie2011-01-143-4/+4
* | Temporarily reinstate prim counting in the update loop to make the productionMelanie2011-01-141-7/+7
* | Implement nonlocal god kicks and freezesMelanie2011-01-141-4/+35
* | Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2011-01-134-66/+163
|\ \
| * \ Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-01-132-4/+22
| |\ \
| | * \ Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2011-01-135-25/+79
| | |\ \
| | * | | Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M.Kitto Flora2011-01-132-4/+22
| * | | | Implement kicking, freezing and unfreezing users in the same sim viaMelanie2011-01-131-58/+117
| * | | | Guard against invalid light color specifiers from the databaseMelanie2011-01-131-4/+24
| | |/ / | |/| |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-133-5/+24
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Make FireAndForgetWrapper a singleton classBlueWall2011-01-133-5/+24
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-120-0/+0
|\ \ \ | |/ /
| * | Dont' trust the viewer! Fix a permission slam error caused by trustingMelanie2011-01-122-1/+6
| * | Fix direct item give permissionsMelanie2011-01-125-23/+73
| * | Use ToString() rather than a cast (more robust)Melanie2011-01-121-1/+1
| * | Partial permissions fix for boxed items.Melanie2011-01-122-0/+17
| * | Fix god mode perms adjustmentMelanie2011-01-121-0/+2