Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-12 | 6 | -62/+78 |
|\ | |||||
| * | refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule | Justin Clark-Casey (justincc) | 2010-03-12 | 4 | -44/+53 |
| | | |||||
| * | start laoding griduser local connector, though it isn't invoked by anything yet | Justin Clark-Casey (justincc) | 2010-03-12 | 2 | -18/+25 |
| | | |||||
* | | Minor tweak to clean up SimianGrid asset service URLs | John Hurliman | 2010-03-12 | 1 | -1/+1 |
| | | |||||
* | | * Added a better check to the SimianGrid connectors to test if they are ↵ | John Hurliman | 2010-03-12 | 18 | -5990/+6190 |
|/ | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET | ||||
* | Fixing the previous patch to work correctly with standalone mode | John Hurliman | 2010-03-12 | 9 | -36/+36 |
| | |||||
* | Fixed SimianGrid connectors to gracefully exit if the required config ↵ | John Hurliman | 2010-03-12 | 9 | -56/+63 |
| | | | | sections are missing | ||||
* | Simplify database setup and remove migration problems by moving all sqlite ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 14 | -22/+43 |
| | | | | | | | | | config-include settings to a separate file for standalone Update information in StandaloneCommon.ini.example to reflect this Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.). Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations | ||||
* | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-12 | 14 | -0/+3727 |
|\ | |||||
| * | Fixed SimianGrid.ini to use GridCommon.ini(.example) | John Hurliman | 2010-03-12 | 1 | -34/+21 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-12 | 3 | -15/+19 |
| |\ | |||||
| | * | Bug fix: "last location" login. | Diva Canto | 2010-03-12 | 1 | -0/+4 |
| | | | |||||
| * | | Adding the SimianGrid connectors | John Hurliman | 2010-03-11 | 13 | -0/+3736 |
| | | | |||||
* | | | Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12 | Justin Clark-Casey (justincc) | 2010-03-12 | 7 | -54/+120 |
| | | | | | | | | | | | | | | | | | | Adds MockUserAccountService and connects it up Stops services being carried over between tests since this leads to hard to find bugs Improves information and error reporting when loading plugins | ||||
* | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-12 | 57 | -150/+773 |
|\ \ \ | | |/ | |/| | |||||
| * | | Changed some properties and methods from private to protected in ↵ | Mikko Pallari | 2010-03-11 | 2 | -15/+15 |
| |/ | | | | | | | LLLoginResponse and LLLoginService so they could be inherited better. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-10 | 56 | -126/+749 |
| |\ | |||||
| | * | Reintroduce a check that was dropped from permissions | Melanie | 2010-03-10 | 1 | -1/+1 |
| | | | |||||
| | * | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 40 | -79/+349 |
| | | | |||||
| | * | Changed a cryptic debug message and a wrong comment | Diva Canto | 2010-03-09 | 2 | -2/+2 |
| | | | |||||
| | * | Fixed caching of user accounts. | Diva Canto | 2010-03-09 | 5 | -32/+45 |
| | | | |||||
| | * | Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator | Melanie | 2010-03-09 | 2 | -9/+27 |
| | | | | | | | | | | | | to use that stored value. | ||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-09 | 9 | -12/+13 |
| | |\ | |||||
| | * | | - parcel blocking, region crossing blocking, teleport blocking | unknown | 2010-03-09 | 12 | -11/+333 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | | * Cleaned up and commented the messy SendInventoryUpdate, fixed a broken ↵ | John Hurliman | 2010-03-10 | 1 | -9/+9 |
| | |/ | |/| | | | | | | | debug line, and commented the debug line out since it can quickly become noisy | ||||
* | | | minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell ↵ | Justin Clark-Casey (justincc) | 2010-03-11 | 2 | -5/+7 |
| | | | | | | | | | | | | the caller that the best match for an incoming request URI is invoked | ||||
* | | | Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6 | Justin Clark-Casey (justincc) | 2010-03-11 | 4 | -990/+5828 |
| | | | | | | | | | | | | Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6) | ||||
* | | | very minor spacing adjustment | Justin Clark-Casey (justincc) | 2010-03-11 | 1 | -1/+0 |
|/ / | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-09 | 10 | -7/+115 |
|\ \ | |/ | |||||
| * | MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData ↵ | unknown | 2010-03-09 | 7 | -3/+101 |
| | | | | | | | | | | | | placeholder added. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | Comment a debug message that is a tad too spammy | Melanie | 2010-03-08 | 1 | -1/+1 |
| | | |||||
| * | Add config option for switching between CSJ2K and BuggyJPEG. | Melanie | 2010-03-08 | 2 | -3/+13 |
| | | |||||
* | | * Typo fixes | John Hurliman | 2010-03-09 | 9 | -12/+13 |
|/ | | | | * Performance improvement in the expensive GenerateClientFlags() | ||||
* | * Added code to support either CSJ2K or OpenJPEG texture decoding. Currently ↵ | John Hurliman | 2010-03-07 | 1 | -20/+33 |
| | | | | hardcoded to CSJ2K (so no functional change) but this could easily be switched to a config option | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-07 | 14 | -8/+109 |
|\ | |||||
| * | Bug fix: correct name of methods in user accounts connector. | Diva Canto | 2010-03-07 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-03-07 | 1 | -2/+2 |
| |\ | |||||
| | * | Small consistency change | Melanie | 2010-03-07 | 1 | -2/+2 |
| | | | |||||
| * | | Removed obsolete configs. | Diva Canto | 2010-03-07 | 1 | -2/+0 |
| |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-06 | 6 | -13/+58 |
| |\ | |||||
| * | | - supporting llTextBox | unknown | 2010-03-06 | 12 | -3/+106 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit ↵ | John Hurliman | 2010-03-07 | 4 | -0/+28 |
| |/ |/| | | | | | systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional) | ||||
* | | Bug fix: store correct position information upon logout. Fixes mantis #4608 | Diva Canto | 2010-03-06 | 6 | -13/+58 |
|/ | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-06 | 30 | -407/+1141 |
|\ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-03-05 | 3 | -20/+28 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-05 | 15 | -240/+887 |
| | |\ | |||||
| | * | | * Cache packed throttle data to avoid repeated allocations in ↵ | John Hurliman | 2010-03-05 | 2 | -15/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | CheckForSignificantMovement() * Removed a lock on "return m_neighbours.Count" in GetInaccurateNeighborCount(). Dictionary<>.Count by itself does not benefit from locking | ||||
| | * | | * Fixed an order of operations bug in CheckForSignificantMovement() that was ↵ | John Hurliman | 2010-03-05 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | causing a flood of child updates to neighbors on login * Removed an unnecessary call to the presence service | ||||
| * | | | Justin, I must have been dyslexic when I wrote UserGridService as the name ↵ | Diva Canto | 2010-03-05 | 7 | -48/+48 |
| | |/ | |/| | | | | | | | for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere. | ||||
| * | | refactor: Move DetachSingleAttachmentToInv to region module | Justin Clark-Casey (justincc) | 2010-03-06 | 6 | -78/+82 |
| | | | | | | | | | | | | need to rationalize method names later |