Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-10-02 | 1 | -12/+19 | |
| | |\ \ | ||||||
| | * | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 6 | -46/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | |||||
| * | | | | * Attempting to fix a issue with console commands & the estate module. Again. | Adam Frisby | 2009-10-02 | 1 | -4/+52 | |
| | |/ / | |/| | | ||||||
| * | | | Added messages to assertions in the failing tests, so that we know which ↵ | Diva Canto | 2009-10-01 | 1 | -12/+19 | |
| |/ / | | | | | | | | | | ones are failing. | |||||
* | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵ | Melanie | 2009-10-02 | 6 | -46/+27 | |
| | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0. | |||||
* | | | Fix a merge conflict | Melanie | 2009-10-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into vehicles | Melanie | 2009-10-01 | 180 | -4620/+1662 | |
|\ \ \ | |/ / | ||||||
| * | | Removed an innefficent List.Contains lookup from UpdateQueue | James J Greensky | 2009-09-30 | 1 | -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/opensim | John Hurliman | 2009-09-30 | 26 | -37/+37 | |
| |\ \ | ||||||
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 26 | -37/+37 | |
| | | | | ||||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2009-09-30 | 187 | -4967/+4246 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 134 | -525/+525 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim | Melanie | 2009-09-30 | 2 | -1/+4 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-29 | 1 | -1/+1 | |
| | | |\ \ | ||||||
| | | * | | | Minor bug fixes. | Diva Canto | 2009-09-29 | 2 | -1/+4 | |
| | | | | | | ||||||
| | * | | | | Change command help text to show .ini in place of .xml when creating regions | Melanie | 2009-09-30 | 1 | -2/+2 | |
| | | |/ / | | |/| | | ||||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim | dr scofield (aka dirk husemann) | 2009-09-29 | 3 | -1/+42 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2009-09-29 | 1 | -4/+7 | |
| | | |\ \ | ||||||
| | | * | | | A little hack to see if this fixes the problems with ~20% of SOG's becoming ↵ | Diva Canto | 2009-09-29 | 3 | -1/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | phantom after an import to megaregions. | |||||
| | * | | | | This fix addresses the problem where phantom objects do not | Alan M Webb | 2009-09-29 | 1 | -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> | |||||
| | * | | | Given the perverse way that strided works, if | Alan M Webb | 2009-09-29 | 1 | -4/+7 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is only one element in the range, it must also coincide with the specified stride. The existing code assumes that the stride starts at start ( which is the expected and most useful behavior). Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net> | |||||
| | * | | Fixed bug in Check4096 (HG). | Diva Canto | 2009-09-28 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | I think I have fixed something that was broken in the scene setup (tests) ↵ | Diva Canto | 2009-09-28 | 1 | -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/opensim | Diva Canto | 2009-09-28 | 7 | -39/+60 | |
| | |\ \ | ||||||
| | | * | | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-09-29 | 7 | -39/+60 | |
| | | | | | ||||||
| | * | | | Improved the Local grid connector to fetch data from the DB when it doesn't ↵ | Diva Canto | 2009-09-28 | 3 | -5/+19 | |
| | |/ / | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -11/+126 | |
| | | | | ||||||
| | * | | Unpacking the mess with OtherRegionUp, so we can have a real cache of the ↵ | Diva Canto | 2009-09-27 | 9 | -103/+84 | |
| | | | | | | | | | | | | | | | | neighbours in the grid service modules. | |||||
| | * | | Poof! on LocalBackend. CommsManager.GridServices deleted. | Diva Canto | 2009-09-26 | 2 | -412/+0 | |
| | | | | ||||||
| | * | | Poof! on OGS1 GridServices. | Diva Canto | 2009-09-26 | 2 | -939/+0 | |
| | | | | ||||||
| | * | | Poof! on Region.Communications.Hypergrid. Grid code deleted. | Diva Canto | 2009-09-26 | 5 | -1456/+0 | |
| | | | | ||||||
| | * | | Moved all HG1 operations to HGGridConnector.cs and ↵ | Diva Canto | 2009-09-26 | 9 | -91/+305 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -9/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -22/+100 | |
| | |\ \ | ||||||
| | * | | | First pass at the heart surgery for grid services. Compiles and runs ↵ | Diva Canto | 2009-09-26 | 23 | -959/+396 | |
| | | | | | | | | | | | | | | | | | | | | minimally. A few bugs to catch now. | |||||
| * | | | | * Adding Scale to EntityBase * Fixing the incorrect initialization of ↵ | John Hurliman | 2009-09-16 | 6 | -28/+46 | |
| | | | | | | | | | | | | | | | | | | | | EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity | |||||
* | | | | | Merge branch '0.6.7-post-fixes' into vehicles | Kitto Flora | 2009-09-30 | 34 | -345/+2161 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -1/+40 | |
| |\ \ \ \ | ||||||
| | * | | | | corrections to viewerMode AddPos() | dahlia | 2009-09-25 | 2 | -1/+40 | |
| | | | | | | ||||||
| * | | | | | * Does a full battery of tests to ensure that the object isn't an attachment ↵ | Teravus Ovares (Dan Olivares) | 2009-09-25 | 2 | -4/+9 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-25 | 2 | -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/opensim | Justin Clark-Casey (justincc) | 2009-09-25 | 9 | -198/+232 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | 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 | 4 | -6/+13 | |
| | | | | | | | | | | | | | | | | | | | | the scene itself but SceneCommunicationService, for now. Beginning to clear the code from using Region.Communications. grid stuff. | |||||
| | * | | | Meshmerizer stores dictionary of unique Meshes keyed on construction ↵ | Dan Lake | 2009-09-24 | 3 | -78/+95 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE Signed-off-by: dahlia <dahliaTrimble@gmailDotCom> |