aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* some improvements to sculptmap alpha handling and LODdahlia2010-03-121-627/+645
|
* minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-03-122-6/+5
|
* refactor: Move another RezSingleAttachment() from Scene.Inventory to ↵Justin Clark-Casey (justincc)2010-03-125-37/+57
| | | | AttachmentsModule
* Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-1215-163/+363
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-125-44/+56
| |\
| * | Minor tweak to clean up SimianGrid asset service URLsJohn Hurliman2010-03-121-1/+1
| | |
| * | * Added a better check to the SimianGrid connectors to test if they are ↵John Hurliman2010-03-1215-163/+363
| | | | | | | | | | | | | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET
* | | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to ↵Justin Clark-Casey (justincc)2010-03-125-58/+60
| |/ |/| | | | | AttachmentsModule
* | refactor: move client invoked AttachObject from SceneGraph to AttachmentsModuleJustin Clark-Casey (justincc)2010-03-124-44/+53
| |
* | start laoding griduser local connector, though it isn't invoked by anything yetJustin Clark-Casey (justincc)2010-03-121-0/+3
|/
* Fixing the previous patch to work correctly with standalone modeJohn Hurliman2010-03-129-36/+36
|
* Fixed SimianGrid connectors to gracefully exit if the required config ↵John Hurliman2010-03-129-56/+63
| | | | sections are missing
* Simplify database setup and remove migration problems by moving all sqlite ↵Justin Clark-Casey (justincc)2010-03-1211-9/+13
| | | | | | | | | 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/opensimJustin Clark-Casey (justincc)2010-03-1211-0/+3667
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-123-15/+19
| |\
| | * Bug fix: "last location" login.Diva Canto2010-03-121-0/+4
| | |
| * | Adding the SimianGrid connectorsJohn Hurliman2010-03-1110-0/+3663
| | |
* | | Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12Justin Clark-Casey (justincc)2010-03-127-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/opensimJustin Clark-Casey (justincc)2010-03-1257-150/+773
|\ \ \ | | |/ | |/|
| * | Changed some properties and methods from private to protected in ↵Mikko Pallari2010-03-112-15/+15
| |/ | | | | | | LLLoginResponse and LLLoginService so they could be inherited better.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-1056-126/+749
| |\
| | * Reintroduce a check that was dropped from permissionsMelanie2010-03-101-1/+1
| | |
| | * Formatting cleanup. Add copyright notices.Jeff Ames2010-03-1040-79/+349
| | |
| | * Changed a cryptic debug message and a wrong commentDiva Canto2010-03-092-2/+2
| | |
| | * Fixed caching of user accounts.Diva Canto2010-03-095-32/+45
| | |
| | * Cache UserLevel in ScenePresence on SP creation. Change IsAdministratorMelanie2010-03-092-9/+27
| | | | | | | | | | | | to use that stored value.
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-099-12/+13
| | |\
| | * | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-0912-11/+333
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | | * Cleaned up and commented the messy SendInventoryUpdate, fixed a broken ↵John Hurliman2010-03-101-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-112-5/+7
| | | | | | | | | | | | the caller that the best match for an incoming request URI is invoked
* | | very minor spacing adjustmentJustin Clark-Casey (justincc)2010-03-111-1/+0
|/ /
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-099-7/+111
|\ \ | |/
| * MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData ↵unknown2010-03-097-3/+101
| | | | | | | | | | | | placeholder added. Signed-off-by: Melanie <melanie@t-data.com>
| * Comment a debug message that is a tad too spammyMelanie2010-03-081-1/+1
| |
| * Add config option for switching between CSJ2K and BuggyJPEG.Melanie2010-03-081-3/+9
| |
* | * Typo fixesJohn Hurliman2010-03-099-12/+13
|/ | | | * Performance improvement in the expensive GenerateClientFlags()
* * Added code to support either CSJ2K or OpenJPEG texture decoding. Currently ↵John Hurliman2010-03-071-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/opensimJohn Hurliman2010-03-0713-6/+109
|\
| * Bug fix: correct name of methods in user accounts connector.Diva Canto2010-03-071-1/+1
| |
| * Small consistency changeMelanie2010-03-071-2/+2
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-066-13/+58
| |\
| * | - supporting llTextBoxunknown2010-03-0612-3/+106
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit ↵John Hurliman2010-03-071-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 #4608Diva Canto2010-03-066-13/+58
|/
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-0626-405/+1137
|\
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-03-053-20/+28
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-0514-240/+885
| | |\
| | * | * Cache packed throttle data to avoid repeated allocations in ↵John Hurliman2010-03-052-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 Hurliman2010-03-051-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 Canto2010-03-057-48/+48
| | |/ | |/| | | | | | | for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere.