aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (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-1410-49/+49
|\
| * Revert "Move OpenSimDefaults,ini into config-include in order to put it with ...Justin Clark-Casey (justincc)2010-09-141-1/+1
| * Move OpenSimDefaults,ini into config-include in order to put it with all the ...Justin Clark-Casey (justincc)2010-09-141-1/+1
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-139-52/+45
| |\
| | * 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
| | * Improve generic message exception logging. Quieten down complaints about unh...Justin Clark-Casey (justincc)2010-09-131-2/+4
| | * Add client name to packet resend log messages to make them a bit more informa...Justin Clark-Casey (justincc)2010-09-131-3/+7
| | * Remove SceneGraph.DetachObject() which was accidentally left around after bei...Justin Clark-Casey (justincc)2010-09-131-10/+0
| | * Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUse...Justin Clark-Casey (justincc)2010-09-131-4/+4
| | * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-132-16/+13
| | * If attachment fails (e.g. because asset wasn't found) then don't try to set a...Justin Clark-Casey (justincc)2010-09-131-4/+2
| | * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-133-12/+8
| * | Add a missing parenthesisMelanie2010-09-131-1/+1
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-131-4/+6
| |\ \ | | |/
| | * * Fixing length calculations for HTTP texture downloads (the end byte is incl...John Hurliman2010-09-131-4/+6
| * | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
| * | Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
| * | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
| |/
* | Fix a small left over buglet and also add checking of the physics actorMelanie Thielker2010-09-142-1/+11
* | LSL compatibility: Don't throw an exception if an invalid key is passed to l...meta72010-09-131-4/+2
* | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
* | Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
* | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1388-1559/+1401
|\ \ | |/
| * MergedJohn Hurliman2010-09-1262-507/+523
| |\
| | * Formatting cleanup.Jeff Ames2010-09-1262-509/+498
| | * Add copyright headers.Jeff Ames2010-09-121-0/+27
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-1211-169/+165
| |/
| * 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
| * Prevent child agents from being blacklisted in the kill record.Melanie2010-09-111-3/+6
| * Make it clear that the "create region" command will reference ini files in th...Justin Clark-Casey (justincc)2010-09-111-5/+6
| * 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-1022-369/+245
| * Over a dozen thread safety fixes in FriendsModuleJohn Hurliman2010-09-091-167/+163
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-082-6/+10
| |\
| | * Made the HG asset and inventory brokers use the Helo service in order to inst...Diva Canto2010-09-081-6/+9
| | * Renamed the Helo server connector to a consistent name. Added this in connect...Diva Canto2010-09-081-0/+1
| * | * Changed 11 calls for session info to the more optimized API methodJohn Hurliman2010-09-083-79/+35
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-086-9/+21
| |\
| | * Rolling back the recent libomv update but keeping the ExpiringCache cleanups ...John Hurliman2010-09-074-8/+8
| | * * Cache null account responses in the SimianUserAccountServiceConnector to av...John Hurliman2010-09-076-10/+17
| * | If a scene object part UUID is changed (only possible when not in a scene), t...Justin Clark-Casey (justincc)2010-09-073-3/+12
* | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-09-111-1/+4
|\ \ \