aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into htb-throttleMelanie2009-10-071-1/+2
|\
| * A small change in FetchInventoryDescendantsCAPS.Diva Canto2009-10-061-1/+2
| |
| * Uncommented log message on CAPs FetchInventoryDescendantsDiva Canto2009-10-061-3/+3
| |
* | Uncommented log message on CAPs FetchInventoryDescendantsDiva Canto2009-10-071-3/+3
| |
* | Merge branch 'master' into htb-throttleMelanie2009-10-071-0/+1
|\ \ | |/
| * * One more debug message on FetchInventoryDescendantsDiva Canto2009-10-061-0/+1
| | | | | | | | * More streams close on finally
| * Revert "Rewrote parts of the code that were double-locking different ↵Melanie2009-10-072-43/+29
| | | | | | | | | | | | objects. This is about half of the code base reviewed." This reverts commit e992ca025571a891333a57012c2cd4419b6581e5.
* | Revert "Merging in diva's locking fixes"Melanie2009-10-072-43/+29
| | | | | | | | This reverts commit 832cc685138b2244529f10b54b373c34adb4a633.
* | Merging in diva's locking fixesJohn Hurliman2009-10-062-29/+43
|\ \ | |/
| * Rewrote parts of the code that were double-locking different objects. This ↵Diva Canto2009-10-062-29/+43
| | | | | | | | is about half of the code base reviewed.
* | Added a debug line for nebadonJohn Hurliman2009-10-061-0/+3
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-061-0/+16
|\ \ | |/ | | | | htb-throttle
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-061-6/+6
| |\
| | * Commenting the DEBUG code that I added yesterday, because it's causing mono ↵Diva Canto2009-10-061-6/+6
| | | | | | | | | | | | | | | | | | to fail with https://bugzilla.novell.com/show_bug.cgi?id=538854
| * | Lock the heartbeat against multiple invocations. May prevent deadlocks and/orMelanie2009-10-061-0/+10
| |/ | | | | | | runaway thread use
| * Correction on the DEBUG code.Diva Canto2009-10-051-4/+3
| |
| * #if DEBBUG code for monitoring the ThreadPool.Diva Canto2009-10-051-0/+7
| |
* | Fixing a few compile errors in the previous commitJohn Hurliman2009-10-061-2/+0
|/
* disable physics actors for flexible primsdahlia2009-10-041-3/+4
|
* Merge branch 'diva-textures-osgrid'Melanie2009-10-042-2/+2
|\
| * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵John Hurliman2009-10-022-2/+2
| | | | | | | | | | | | Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework) * Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
* | Merge branch 'master' into diva-texturesMelanie2009-10-023-51/+51
|\ \
| * | - cleaning up LandData/ILandObject capitalization issuesdr scofield (aka dirk husemann)2009-10-023-51/+51
| | | | | | | | | | | | - adding LandDataSerializer to OAR mechanics
* | | Merge branch 'master' into diva-texturesMelanie2009-10-0251-793/+592
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-021-12/+19
| |\
| | * Added messages to assertions in the failing tests, so that we know which ↵Diva Canto2009-10-011-12/+19
| | | | | | | | | | | | ones are failing.
| * | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵Melanie2009-10-023-36/+16
| |/ | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
| * Removed an innefficent List.Contains lookup from UpdateQueueJames J Greensky2009-09-301-5/+4
| | | | | | | | | | | | Changed the underlying data structure used to detected duplicate in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a List to a Dictionary.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3010-16/+16
| |\
| | * Formatting cleanup.Jeff Ames2009-10-0110-16/+16
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3048-870/+702
| |\ \ | | |/
| | * Formatting cleanup.Jeff Ames2009-10-0142-165/+165
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensimdr scofield (aka dirk husemann)2009-09-292-0/+22
| | |\
| | | * A little hack to see if this fixes the problems with ~20% of SOG's becoming ↵Diva Canto2009-09-292-0/+22
| | | | | | | | | | | | | | | | phantom after an import to megaregions.
| | * | This fix addresses the problem where phantom objects do notAlan M Webb2009-09-291-1/+1
| | |/ | | | | | | | | | | | | | | | | | | always behave like they are phantom, and llVolumeDetect seems to operate in a random fashion. Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
| | * I think I have fixed something that was broken in the scene setup (tests) ↵Diva Canto2009-09-281-3/+4
| | | | | | | | | | | | and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now.
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-281-1/+1
| | |\
| | | * Add copyright header. Formatting cleanup.Jeff Ames2009-09-291-1/+1
| | | |
| | * | Improved the Local grid connector to fetch data from the DB when it doesn't ↵Diva Canto2009-09-281-3/+4
| | |/ | | | | | | | | | | | | | | | find it in the cache. Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes.
| | * Neighbours cache working.Diva Canto2009-09-272-3/+5
| | |
| | * Unpacking the mess with OtherRegionUp, so we can have a real cache of the ↵Diva Canto2009-09-275-95/+74
| | | | | | | | | | | | neighbours in the grid service modules.
| | * Moved all HG1 operations to HGGridConnector.cs and ↵Diva Canto2009-09-262-23/+29
| | | | | | | | | | | | | | | | | | HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo. Fixed small bugs with hyperlinked regions' map positions.
| | * Fixed MapBlocks bug, wrong order of arguments. First version that seems ↵Diva Canto2009-09-261-7/+1
| | | | | | | | | | | | | | | | | | completely functional. Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-09-264-13/+23
| | |\
| | | * * Does a full battery of tests to ensure that the object isn't an attachment ↵Teravus Ovares (Dan Olivares)2009-09-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | before border crossing * Fixes 'Inconsistent Attachment State' when teleporting into another region besides the SW most region slot on a MegaRegion. * Fixes a host of other unintended attachment border cross edge cases that lead to Inconsistent attachment state.
| | | * * Fixes teleporting within megaregions on HG enabled regions. You can ↵Teravus Ovares (Dan Olivares)2009-09-252-3/+9
| | | | | | | | | | | | | | | | teleport around now. (but it still doesn't fix the inconsistent attachment state when teleporting into region slots that are not the south west region on megaregions)
| | | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-09-251-0/+7
| | | |\
| | | * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-09-251-9/+8
| | | | |
| | * | | First pass at the heart surgery for grid services. Compiles and runs ↵Diva Canto2009-09-266-455/+181
| | | |/ | | |/| | | | | | | | | minimally. A few bugs to catch now.
| | * | Moved the property RegionLoginsEnabled from GridComms to the Scene -- not ↵Diva Canto2009-09-251-0/+7
| | |/ | | | | | | | | | the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff.
generated by cgit v1.1 at 2024-08-24 14:54:40 +0000