aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-311-1/+1
|\
| * Use Environment.TickCount & Int32.MaxValue; instead of ↵Justin Clark-Casey (justincc)2012-01-311-1/+1
| | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
* | Merge branch 'master' into careminsterMelanie2012-01-301-0/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-301-0/+8
| | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
* | Merge branch 'master' into careminsterMelanie2012-01-281-2/+2
|\ \ | |/
| * Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-281-2/+2
| | | | | | | | agent id anyway
* | Merge branch 'master' into careminsterMelanie2012-01-261-0/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/EstateSettings.cs
| * llManageEstateAccess implementation ↵PixelTomsen2012-01-261-0/+6
| | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-01-261-0/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * llGetParcelMusicURL implementation ↵Pixel Tomsen2012-01-251-0/+6
| | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-01-251-123/+125
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Comment out asset statistics section from periodic stats as these have not ↵Justin Clark-Casey (justincc)2012-01-241-108/+109
| | | | | | | | | | | | | | been recorded for a very long time. Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness. Some data is available via other means (e.g. "fcache status").
| * Comment out inventory statistics section from periodic stats, since this ↵Justin Clark-Casey (justincc)2012-01-241-14/+15
| | | | | | | | only contained the now uncollected and irrelevant inventory cache number.
| * Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-241-1/+1
| | | | | | | | spwan point positioning on rotated telehubs.
| * Reverse the spawn point distance vectorMelanie2012-01-241-3/+3
| |
| * Correct a coordinate to make the viewer like itMelanie2012-01-241-2/+2
| |
* | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-241-1/+1
| | | | | | | | spwan point positioning on rotated telehubs.
* | Reverse the spawn point distance vectorMelanie2012-01-241-3/+3
| |
* | Correct a coordinate to make the viewer like itMelanie2012-01-241-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-241-63/+45
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-241-71/+45
| | | | | | | | additional redundant information.
* | Merge branch 'master' into careminsterMelanie2012-01-231-44/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Finish connecting Telehub to databaseBlueWall2012-01-221-44/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-01-221-0/+151
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-222-150/+150
| | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
| * Telehub Support:BlueWall2012-01-211-0/+150
| | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | Merge branch 'master' into careminsterMelanie2012-01-211-0/+5
|\ \ | |/
| * Telehub Support:BlueWall2012-01-201-0/+5
| | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
* | Merge branch 'master' into careminsterMelanie2012-01-161-0/+8
|\ \ | |/
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-0/+8
| | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
* | Merge branch 'master' into careminsterMelanie2012-01-132-73/+0
|\ \ | |/
| * Move some interfaces to a more apropriate placeBlueWall2012-01-122-73/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-121-4/+4
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-121-4/+4
| | | | | | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
* | Merge branch 'master' into careminsterMelanie2012-01-061-0/+36
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Adding empty ISearchModule interfaceBlueWall2012-01-051-0/+36
| |
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+37
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profile UpdatesBlueWall2012-01-031-0/+37
| | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | Merge branch 'master' into careminsterMelanie2011-12-202-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-203-7/+21
| |\
| * | Commented a couple of verbose debug messages.Diva Canto2011-12-162-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2011-12-191-7/+14
|\ \ \ | | |/ | |/|
| * | Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | | Merge branch 'master' into careminsterMelanie2011-12-182-0/+7
|\ \ \ | |/ /
| * | Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-172-0/+7
| |/ | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
* | Merge branch 'master' into careminsterMelanie2011-12-121-24/+55
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Added an option for extra settings within region ini file. Any non-hardcoded ↵Dan Lake2011-12-121-20/+55
| | | | | | | | key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo
* | Merge branch 'master' into careminsterMelanie2011-12-101-0/+3
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-101-0/+3
| |
* | Merge branch 'master' into careminsterMelanie2011-12-104-15/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
generated by cgit v1.1 at 2024-12-23 05:50:41 +0000