aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)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
| | | | | | | | | | | | | | | | all the other default files" This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1. Reverted by agreement.
| * Move OpenSimDefaults,ini into config-include in order to put it with all the ↵Justin Clark-Casey (justincc)2010-09-141-1/+1
| | | | | | | | other default files
| * 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
| | | | | | | | | | | | This can get very spammy with regularly changing objects. Please uncomment if required.
| | * minor: Add comments which explain what's going on wrt avatar movements at ↵Justin Clark-Casey (justincc)2010-09-132-0/+6
| | | | | | | | | | | | various points in the main scene loop and associated methods
| | * Improve generic message exception logging. Quieten down complaints about ↵Justin Clark-Casey (justincc)2010-09-131-2/+4
| | | | | | | | | | | | unhandled GenericMessages
| | * Add client name to packet resend log messages to make them a bit more ↵Justin Clark-Casey (justincc)2010-09-131-3/+7
| | | | | | | | | | | | informative
| | * Remove SceneGraph.DetachObject() which was accidentally left around after ↵Justin Clark-Casey (justincc)2010-09-131-10/+0
| | | | | | | | | | | | being migrated to AttachmentsModule
| | * Rename now protected method SetAttachmentInventoryStatus() to ↵Justin Clark-Casey (justincc)2010-09-131-4/+4
| | | | | | | | | | | | ShowAttachInUserInventory() to match ShowDetachInUserInventory()
| | * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-132-16/+13
| | | | | | | | | | | | No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
| | * If attachment fails (e.g. because asset wasn't found) then don't try to set ↵Justin Clark-Casey (justincc)2010-09-131-4/+2
| | | | | | | | | | | | | | | | | | attachment as shown in inventory Doing this results in a null reference exception
| | * 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 ↵John Hurliman2010-09-131-4/+6
| | | | | | | | | | | | inclusive in Range: headers)
| * | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
| | | | | | | | | | | | Provide a mostly empty OpenSim.ini.example
| * | Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
| | | | | | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example
| * | 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
| | | | | | | | | | position on backup. This way, ant object that has been moved will be checked for ghost prims as soon as it is persisted.
* | LSL compatibility: Don't throw an exception if an invalid key is passed to ↵meta72010-09-131-4/+2
| | | | | | | | llInstantMessage, instead shout about it and apply the usual delay. This now matches SL.
* | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
| | | | | | | | Provide a mostly empty OpenSim.ini.example
* | Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
| | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example
* | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1388-1559/+1401
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * 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
| |/ | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
| * Added a stub for ↵John Hurliman2010-09-122-20/+102
| | | | | | | | OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
| * 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 ↵Justin Clark-Casey (justincc)2010-09-111-5/+6
| | | | | | | | | | | | the regions directory (usually Regions/) Also convert some tabs into spaces.
| * Made it impossible to create a user with names containing spaces and ↵randomhuman2010-09-101-2/+3
| | | | | | | | prevented passwords from being echoed after enter is pressed.
| * 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 ↵Diva Canto2010-09-081-6/+9
| | | | | | | | | | | | instantiate the right network connectors. Tested on Robust only.
| | * Renamed the Helo server connector to a consistent name. Added this in ↵Diva Canto2010-09-081-0/+1
| | | | | | | | | | | | connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
| * | * 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
| | | | | | | | | | | | (as much as is possible). There was a report of non-finite avatar positions after the update
| | * * Cache null account responses in the SimianUserAccountServiceConnector to ↵John Hurliman2010-09-076-10/+17
| | | | | | | | | | | | | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
| * | If a scene object part UUID is changed (only possible when not in a scene), ↵Justin Clark-Casey (justincc)2010-09-073-3/+12
| | | | | | | | | | | | then adjust the inventory items to point to the new uuid as well
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-09-111-1/+4
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor