aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-1827-3180/+3313
|\
| * 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.
| * Removed the unused use_async_when_possible config variableJohn Hurliman2010-03-163-19/+2
| |
| * Fixed several unhandled exceptions and performance issues with ↵John Hurliman2010-03-164-52/+60
| | | | | | | | 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
| * Get the local inner simulation service object to the handler so that there ↵Diva Canto2010-03-152-0/+10
| | | | | | | | 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-152-2846/+2846
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-158-2921/+2961
| |\
| * | * 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-1529-3103/+3332
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | | |
| * | | 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-125-47/+192
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-125-44/+56
| | |\ \
| | * | | * Added a better check to the SimianGrid connectors to test if they are ↵John Hurliman2010-03-125-47/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |/ /
| * | Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12Justin Clark-Casey (justincc)2010-03-122-18/+13
| | | | | | | | | | | | | | | | | | 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://opensimulator.org/var/git/opensimJohn Hurliman2010-03-1023-83/+455
| |\ \
| | * | Reintroduce a check that was dropped from permissionsMelanie2010-03-101-1/+1
| | | |
| | * | Formatting cleanup. Add copyright notices.Jeff Ames2010-03-1014-37/+64
| | | |
| | * | Changed a cryptic debug message and a wrong commentDiva Canto2010-03-091-1/+1
| | | |
| | * | Fixed caching of user accounts.Diva Canto2010-03-093-32/+42
| | | |
| | * | 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
* | | | 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-1259-6280/+2711
| |\ \ \
| | * | | 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-0659-6167/+2733
| | |\ \ \ \
| | | * | | | - 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
| |/ / / /