aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* reorder some code to avoid merge issues in the futureMelanie2010-09-141-5/+5
* Fix merge issuesMelanie2010-09-142-5/+2
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-145-26/+14
|\
| * Comment out SOG storing debug log messageJustin Clark-Casey (justincc)2010-09-141-3/+3
| * minor: Add comments which explain what's going on wrt avatar movements at var...Justin Clark-Casey (justincc)2010-09-132-0/+6
| * Remove SceneGraph.DetachObject() which was accidentally left around after bei...Justin Clark-Casey (justincc)2010-09-131-10/+0
| * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-131-11/+0
| * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-131-9/+3
* | Fix a small left over buglet and also add checking of the physics actorMelanie Thielker2010-09-141-0/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1329-804/+702
|\ \ | |/
| * MergedJohn Hurliman2010-09-1221-86/+113
| |\
| | * Formatting cleanup.Jeff Ames2010-09-1221-88/+88
| | * Add copyright headers.Jeff Ames2010-09-121-0/+27
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-128-118/+123
| |/
| * Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataService...John Hurliman2010-09-122-20/+102
| * Shuffling fields and properties around in Scene to make Scene.cs more readableJohn Hurliman2010-09-111-138/+124
| * Changed all string references of "IRegionDataStore" to "ISimulationDataStore"John Hurliman2010-09-111-2/+2
| * Fixed the naming mess around data connectors for simulation dataJohn Hurliman2010-09-116-11/+11
| * Made it impossible to create a user with names containing spaces and prevente...randomhuman2010-09-101-2/+3
| * Second pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-103-58/+35
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-108-346/+221
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-083-3/+10
| |\
| | * * Cache null account responses in the SimianUserAccountServiceConnector to av...John Hurliman2010-09-071-1/+3
| * | If a scene object part UUID is changed (only possible when not in a scene), t...Justin Clark-Casey (justincc)2010-09-072-2/+11
* | | Make AddRestoredSceneObject reset the IsDeleted flag so we can take anMelanie Thielker2010-09-081-1/+4
* | | Fix some issues with unlinkingMelanie Thielker2010-09-071-56/+53
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-071-0/+2
|\ \ \ | | |/ | |/|
| * | Make sure unlinked child prims get persistedMelanie2010-09-071-0/+5
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-0711-58/+163
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-071-2/+2
| |\ \ | | |/
| | * minor: comment out some excessive test loggingJustin Clark-Casey (justincc)2010-09-071-1/+1
| | * Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-076-42/+58
| * | Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-076-42/+58
| |/
| * 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-062-6/+1
| * 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-067-21/+78
| * Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, becauseMelanie Thielker2010-09-061-1/+25
| * Add missing IDwellModule interfaceMelanie2010-09-051-0/+37
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2010-09-066-29/+91
|\ \
| * | Don't turn off the sale settings on child prims when linking, and on copyMelanie Thielker2010-09-061-8/+0
| * | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, becauseMelanie Thielker2010-09-061-1/+25
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-052-18/+43
| |\ \ | | |/
| | * Logout the presence if client IP verification fails.Diva Canto2010-09-041-0/+2
| | * Move code that allows llGiveInvetory() to move item into appropriate system f...Justin Clark-Casey (justincc)2010-09-041-8/+40
| | * Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)Justin Clark-Casey (justincc)2010-09-041-8/+27
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-0/+21
| |\ \ | | |/
| | * Fix an issue with rezzing scripted objects.Melanie Thielker2010-09-031-2/+2
| | * Remove commented code and the comment, as the change has proven outMelanie Thielker2010-09-021-3/+0
| | * Experimentally comment the sending of unbaked avatarsMelanie Thielker2010-09-021-1/+3