aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-1846-3234/+3420
|\
| * Flesh out the new permission methodMelanie2010-03-181-4/+95
| |
| * Unify a previous refactor of object return with the older solution. WeMelanie2010-03-186-102/+21
| | | | | | | | really don't need two methods doing the same thing, but differently.
| * Inconsistent locking of ScenePresence array in SceneGraph. Fixed by ↵Dan Lake2010-03-1710-233/+258
| | | | | | | | | | | | eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class. This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
| * minor logging changes to BaseHttpServer, OSHttpRequestJustin Clark-Casey (justincc)2010-03-162-30/+58
| |
| * Removed the unused use_async_when_possible config variableJohn Hurliman2010-03-164-26/+2
| |
| * Fixed several unhandled exceptions and performance issues with ↵John Hurliman2010-03-165-54/+66
| | | | | | | | PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time
| * * Fixing the SimianGrid friend connector enabled detection since the friends ↵John Hurliman2010-03-161-1/+9
| | | | | | | | module uses a different pattern in the .ini file
| * Fixed a bad module name in SimianGrid.iniJohn Hurliman2010-03-151-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-156-2/+32
| |\
| | * Get the local inner simulation service object to the handler so that there ↵Diva Canto2010-03-155-0/+17
| | | | | | | | | | | | is no possibility of cascading requests when failures happen.
| | * Restoring LoadPlugin as it was before. Justin's last change made it throw.Diva Canto2010-03-153-2848/+2861
| | |
| * | Fixing line endingsJohn Hurliman2010-03-152-2846/+2846
| | |
| * | * Fixed a bug in Simian.IsSimianEnabled (since the default module strings ↵John Hurliman2010-03-151-1/+1
| |/ | | | | | | follow the form OpenSim.Services.Connectors.dll:SimianGridServiceConnector instead of SimianGridServiceConnector)
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-1510-2927/+2966
| |\
| * | Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectorsJohn Hurliman2010-03-1510-12/+12
| | |
| * | * UuidGatherer now tracks asset types for assets it discovers. The asset ↵John Hurliman2010-03-157-33/+47
| | | | | | | | | | | | | | | | | | types are inferred from context * OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-03-182-193/+199
|\ \ \
| * \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-03-182-193/+199
| |\ \ \ | | | | | | | | | | | | | | | careminster
| | * | | Prevent llTeleportAgentHome from affecting godsThomas Grimshaw2010-03-171-0/+3
| | | | |
| | * | | Debugger tags for VS2010Thomas Grimshaw2010-03-162-193/+196
| | | | |
| * | | | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-186-102/+21
| |/ / / | | | | | | | | | | | | really don't need two methods doing the same thing, but differently.
* | | | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-186-102/+21
| | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently.
* | | | Change GodLevel to UserLevel so gods can teleport freely without havingMelanie2010-03-151-1/+1
| | | | | | | | | | | | | | | | to enter god mode first
* | | | 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
| | |\ \
generated by cgit v1.1 at 2024-11-14 18:58:56 +0000