aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-1589-3672/+12870
|\
| * flip UVs for profile facesdahlia2010-03-131-1/+1
| |
| * add a null check in ScenePresence constructordahlia2010-03-131-1/+2
| |
| * correct some references which could produce erroneous prim face numbersdahlia2010-03-121-2202/+2201
| |
| * 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-1218-5990/+6190
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-126-62/+78
| | |\
| | * | 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-1218-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
| * | | 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-122-18/+25
| |/
| * 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-1214-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/opensimJustin Clark-Casey (justincc)2010-03-1214-0/+3727
| |\
| | * Fixed SimianGrid.ini to use GridCommon.ini(.example)John Hurliman2010-03-121-34/+21
| | |
| | * 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-1113-0/+3736
| | | |
| * | | 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.
| | * | * 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
| * | | Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6Justin Clark-Casey (justincc)2010-03-114-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 adjustmentJustin Clark-Casey (justincc)2010-03-111-1/+0
| |/ /
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-03-1519-2754/+1669
|\ \ \
| * \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-03-141-2/+5
| |\ \ \
| | * | | Fix the delay in llGiveInventory so that it only takes effect when giving ↵CasperW2010-03-131-2/+5
| | | | | | | | | | | | | | | | | | | | inventory to an avatar (this now replicates SL behaviour)
| * | | | RotLookAt repaired; debug msg cleanup.Kitto Flora2010-03-144-444/+151
| |/ / /
| * | | Fix Rotation Lock. NOTE: This version had poor border crossing controlKitto Flora2010-03-122-24/+18
| | | |
| * | | Resolved mergeKitto Flora2010-03-1281-6386/+2871
| |\ \ \
| | * | | Small consistency changeMelanie2010-03-071-1/+1
| | | | |
| | * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-03-063-655/+84
| | |\ \ \ | | | | | | | | | | | | | | | | | | careminster
| | * \ \ \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-0681-6273/+2893
| | |\ \ \ \
| | | * | | | - implementing server 1.38 functionsunknown2010-03-065-10/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | | * | | | Remove a superfluous array creationMelanie2010-03-041-1/+0
| | | | | | |
| * | | | | | Dynamics Integration Part 1Kitto Flora2010-03-113-1756/+1644
| | |_|/ / / | |/| | | |
| * | | | | Fix Physics angular reference frame.Kitto Flora2010-03-043-655/+84
| |/ / / /
| * | | | Remove a superfluous array creationMelanie2010-03-041-1/+0
| | | | |
* | | | | Cache UserLevel in ScenePresence on SP creation. Change IsAdministratorMelanie2010-03-092-9/+27
| | | | | | | | | | | | | | | | | | | | to use that stored value.