aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-0719-65/+379
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-072-5/+14
| |\
| | * minor: comment out some excessive test loggingJustin Clark-Casey (justincc)2010-09-071-1/+1
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-071-3/+12
| | |\
| | | * Fix yet another cause of "Ghost attachments"Melanie Thielker2010-09-061-3/+12
| | * | Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-0710-57/+129
| * | | Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-0710-57/+129
| |/ /
| * | Add test that checks correct persistence when an unlink is quickly followed b...Justin Clark-Casey (justincc)2010-09-061-9/+40
| * | Make console backup command do a forced backup rather than non-forcedJustin Clark-Casey (justincc)2010-09-064-8/+3
| * | extend TestNewSceneObjectLinkPersistence() to check for presence of non-root ...Justin Clark-Casey (justincc)2010-09-061-2/+3
| * | Add test to check persistence of newly added pre-linked objectsJustin Clark-Casey (justincc)2010-09-0610-24/+234
| |/
| * Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, becauseMelanie Thielker2010-09-062-4/+36
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2010-09-0665-674/+1003
|\ \
| * | Fix yet another cause of "Ghost attachments"Melanie Thielker2010-09-061-3/+12
| * | Don't turn off the sale settings on child prims when linking, and on copyMelanie Thielker2010-09-061-8/+0
| * | Revert "Workaround for mono bug #312968"Melanie Thielker2010-09-061-1/+0
| * | Workaround for mono bug #312968Melanie Thielker2010-09-061-0/+1
| * | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, becauseMelanie Thielker2010-09-062-4/+36
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-059-110/+180
| |\ \ | | |/
| | * Fix a handful of copypaste errorsMelanie2010-09-054-4/+4
| | * Change UserAccountService to matchMelanie2010-09-051-12/+22
| | * Make Simian profiles respect the module chosen in [Profile]Melanie2010-09-051-2/+10
| | * Fix up presence connector in SimianGridMelanie2010-09-051-12/+22
| | * Fix up Simian inentoryMelanie2010-09-051-18/+30
| | * Friends works differently, it' snot even a region module at all, but a connectorMelanie2010-09-051-16/+1
| | * And the avatar services :)Melanie2010-09-051-12/+22
| | * Add the m_Enabled pattern to Simian AuthMelanie2010-09-051-12/+22
| | * Add m_Enabled pattern to SimianGridConnectorMelanie2010-09-051-14/+28
| | * As an exmple, add the code to disable connectors intot he simian assetMelanie2010-09-051-12/+23
| | * Add missing IDwellModule interfaceMelanie2010-09-051-0/+37
| | * Fix build breakMelanie2010-09-051-4/+0
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-0541-428/+546
| |\ \ | | |/
| | * Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-0510-102/+72
| | * Logout the presence if client IP verification fails.Diva Canto2010-09-041-0/+2
| | * One more debug message to track an issue on Danger grid.Diva Canto2010-09-041-0/+1
| | * Make User Agent Service and Login Service separable.Diva Canto2010-09-046-32/+81
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-046-3/+49
| | |\
| | | * Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-036-3/+49
| | * | Move code that allows llGiveInvetory() to move item into appropriate system f...Justin Clark-Casey (justincc)2010-09-048-80/+56
| | |/
| | * Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)Justin Clark-Casey (justincc)2010-09-043-14/+33
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-031-22/+19
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-034-12/+37
| | | |\
| | | * | Make SimianFriendsServiceConnector initialize like the other connectors and g...John Hurliman2010-09-031-22/+19
| | * | | minor: remove mono compiler warningsJustin Clark-Casey (justincc)2010-09-033-92/+91
| | | |/ | | |/|
| | * | In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ra...Justin Clark-Casey (justincc)2010-09-033-11/+36
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-0311-165/+166
| | |\ \ | | | |/
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-031-2/+3
| | | |\
| | | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-037-13/+43
| | | |\ \
| | | * | | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to...John Hurliman2010-09-0311-165/+166
| | * | | | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-09-031-1/+1
| | | |_|/ | | |/| |