Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into htb-throttle | Melanie | 2009-10-10 | 1 | -4/+3 |
|\ | | | | | | | | | This is hand-edited to not let master changes creep into here and may cause a somewhat rocky merge to master later. | ||||
| * | Fix selling objects | Melanie | 2009-10-10 | 1 | -4/+3 |
| | | |||||
* | | Calling .Close() on AutoResetEvent and ManualResetEvent (those classes ↵ | John Hurliman | 2009-10-09 | 1 | -2/+2 |
|/ | | | | contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet | ||||
* | Revert "Merging in diva's locking fixes" | Melanie | 2009-10-07 | 5 | -62/+51 |
| | | | | This reverts commit 832cc685138b2244529f10b54b373c34adb4a633. | ||||
* | Merging in diva's locking fixes | John Hurliman | 2009-10-06 | 5 | -51/+62 |
|\ | |||||
| * | Rewrote parts of the code that were double-locking different objects. This ↵ | Diva Canto | 2009-10-06 | 5 | -51/+62 |
| | | | | | | | | is about half of the code base reviewed. | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵ | John Hurliman | 2009-10-06 | 3 | -2/+6 |
|\ \ | |/ | | | | | htb-throttle | ||||
| * | * Removed verbose debug message | Diva Canto | 2009-10-06 | 2 | -2/+2 |
| | | | | | | | | | | * Restored HG inventory access which had been lost upon adding a 3rd argument to inventory and asset server handlers * Fixed a stupid bug in the InventoryConnector which was making move items do things twice | ||||
| * | Removing dependencies on System.Runtime.Remoting. | Diva Canto | 2009-10-06 | 1 | -0/+4 |
| | | |||||
* | | Fixing a few compile errors in the previous commit | John Hurliman | 2009-10-06 | 3 | -4/+0 |
|/ | |||||
* | * minor: tweak asset cache logging levels downwards | Justin Clark-Casey (justincc) | 2009-10-05 | 4 | -12/+9 |
| | |||||
* | GetRegionByPosition: use the cache, Luke. | Diva Canto | 2009-10-05 | 2 | -0/+28 |
| | |||||
* | * KeepAlive set to false in expect_user and log_off. | Diva Canto | 2009-10-04 | 1 | -4/+9 |
| | | | | * Check for null SP in PermissionsModule. | ||||
* | Stream needs to be closed before the file can be moved... | Diva Canto | 2009-10-04 | 1 | -5/+6 |
| | |||||
* | Make sure to close the file streams on the FlotsamCache, even if something ↵ | Diva Canto | 2009-10-04 | 1 | -4/+12 |
| | | | | fails. | ||||
* | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-04 | 3 | -9/+9 |
|\ | |||||
| * | * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵ | John Hurliman | 2009-10-02 | 3 | -9/+9 |
| | | | | | | | | | | | | 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? | ||||
* | | Fix my build break | Melanie | 2009-10-03 | 1 | -2/+2 |
| | | |||||
* | | Small permissions tweak | Melanie | 2009-10-03 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 8 | -268/+304 |
|\ \ | |||||
| * | | - cleaning up LandData/ILandObject capitalization issues | dr scofield (aka dirk husemann) | 2009-10-02 | 8 | -268/+304 |
| | | | | | | | | | | | | - adding LandDataSerializer to OAR mechanics | ||||
* | | | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 65 | -540/+2738 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | * Attempting to fix a issue with console commands & the estate module. Again. | Adam Frisby | 2009-10-02 | 1 | -4/+52 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 7 | -8/+8 |
| | | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-10-01 | 41 | -193/+193 |
| | | |||||
| * | Minor bug fixes. | Diva Canto | 2009-09-29 | 2 | -1/+4 |
| | | |||||
| * | A little hack to see if this fixes the problems with ~20% of SOG's becoming ↵ | Diva Canto | 2009-09-29 | 1 | -1/+20 |
| | | | | | | | | phantom after an import to megaregions. | ||||
| * | Fixed bug in Check4096 (HG). | Diva Canto | 2009-09-28 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-28 | 1 | -1/+28 |
| |\ | |||||
| | * | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-09-29 | 1 | -1/+28 |
| | | | |||||
| * | | Improved the Local grid connector to fetch data from the DB when it doesn't ↵ | Diva Canto | 2009-09-28 | 2 | -2/+15 |
| |/ | | | | | | | | | | | 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. | ||||
| * | Fixed an issue with the PresenceModule in "gridmode", introduced by my ↵ | Diva Canto | 2009-09-27 | 1 | -3/+0 |
| | | | | | | | | fixing the notifications of the messaging service in standalone. | ||||
| * | Guarding the methods under if (m_Enabled) | Diva Canto | 2009-09-27 | 1 | -3/+7 |
| | | |||||
| * | Neighbours cache working. | Diva Canto | 2009-09-27 | 4 | -8/+121 |
| | | |||||
| * | Unpacking the mess with OtherRegionUp, so we can have a real cache of the ↵ | Diva Canto | 2009-09-27 | 3 | -7/+8 |
| | | | | | | | | neighbours in the grid service modules. | ||||
| * | Moved all HG1 operations to HGGridConnector.cs and ↵ | Diva Canto | 2009-09-26 | 5 | -42/+249 |
| | | | | | | | | | | | | HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo. Fixed small bugs with hyperlinked regions' map positions. | ||||
| * | Fixed a bug with link-region. | Diva Canto | 2009-09-26 | 3 | -28/+14 |
| | | |||||
| * | Fixed the order of params to GetRegionRange. | Diva Canto | 2009-09-26 | 1 | -6/+10 |
| | | |||||
| * | Fixed MapBlocks bug, wrong order of arguments. First version that seems ↵ | Diva Canto | 2009-09-26 | 2 | -2/+14 |
| | | | | | | | | | | | | completely functional. Also fixed the notification of the message server in standalone -- that server doesn't usually exist. | ||||
| * | More redirects to HGGridConnector-as-HyperlinkService. | Diva Canto | 2009-09-26 | 2 | -6/+20 |
| | | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-26 | 3 | -8/+37 |
| |\ | |||||
| | * | * Does a full battery of tests to ensure that the object isn't an attachment ↵ | Teravus Ovares (Dan Olivares) | 2009-09-25 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-09-25 | 2 | -3/+3 |
| | |\ | |||||
| | * | | Don't preserve full user profile details within iars for now | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | This information was not being used in the load process | ||||
| | * | | add control files containing version info to iars | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -0/+28 |
| | | | | |||||
| | * | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2009-09-25 | 1 | -4/+3 |
| | | | | |||||
| * | | | First pass at the heart surgery for grid services. Compiles and runs ↵ | Diva Canto | 2009-09-26 | 12 | -272/+192 |
| | |/ | |/| | | | | | | | minimally. A few bugs to catch now. | ||||
| * | | More small changes to FlotsamAssetCache as per mcortez' request. | Diva Canto | 2009-09-25 | 1 | -2/+2 |
| | | | |||||
| * | | Moved the property RegionLoginsEnabled from GridComms to the Scene -- not ↵ | Diva Canto | 2009-09-25 | 1 | -1/+1 |
| |/ | | | | | | | the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff. | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-09-24 | 9 | -282/+1661 |
| |\ |