Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 27 | -3180/+3313 |
|\ | |||||
| * | Flesh out the new permission method | Melanie | 2010-03-18 | 1 | -4/+95 |
| | | |||||
| * | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 6 | -102/+21 |
| | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
| * | Inconsistent locking of ScenePresence array in SceneGraph. Fixed by ↵ | Dan Lake | 2010-03-17 | 10 | -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 variable | John Hurliman | 2010-03-16 | 3 | -19/+2 |
| | | |||||
| * | Fixed several unhandled exceptions and performance issues with ↵ | John Hurliman | 2010-03-16 | 4 | -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 Canto | 2010-03-15 | 2 | -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 Canto | 2010-03-15 | 2 | -2846/+2846 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-15 | 8 | -2921/+2961 |
| |\ | |||||
| * | | * UuidGatherer now tracks asset types for assets it discovers. The asset ↵ | John Hurliman | 2010-03-15 | 7 | -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-refactor | Melanie | 2010-03-18 | 2 | -193/+199 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-03-18 | 2 | -193/+199 |
| |\ \ \ | | | | | | | | | | | | | | | | careminster | ||||
| | * | | | Prevent llTeleportAgentHome from affecting gods | Thomas Grimshaw | 2010-03-17 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Debugger tags for VS2010 | Thomas Grimshaw | 2010-03-16 | 2 | -193/+196 |
| | | | | | |||||
| * | | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 6 | -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. We | Melanie | 2010-03-18 | 6 | -102/+21 |
| | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
* | | | | Change GodLevel to UserLevel so gods can teleport freely without having | Melanie | 2010-03-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | to enter god mode first | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 29 | -3103/+3332 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | flip UVs for profile faces | dahlia | 2010-03-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | add a null check in ScenePresence constructor | dahlia | 2010-03-13 | 1 | -1/+2 |
| | | | | |||||
| * | | | correct some references which could produce erroneous prim face numbers | dahlia | 2010-03-12 | 1 | -2202/+2201 |
| | | | | |||||
| * | | | some improvements to sculptmap alpha handling and LOD | dahlia | 2010-03-12 | 1 | -627/+645 |
| | | | | |||||
| * | | | refactor: Move another RezSingleAttachment() from Scene.Inventory to ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 5 | -37/+57 |
| | | | | | | | | | | | | | | | | AttachmentsModule | ||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-12 | 5 | -47/+192 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-12 | 5 | -44/+56 |
| | |\ \ | |||||
| | * | | | * Added a better check to the SimianGrid connectors to test if they are ↵ | John Hurliman | 2010-03-12 | 5 | -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-12 | 5 | -58/+60 |
| | |/ / | |/| | | | | | | | | | | AttachmentsModule | ||||
| * | | | 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 | 1 | -0/+3 |
| |/ / | |||||
| * | | Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12 | Justin Clark-Casey (justincc) | 2010-03-12 | 2 | -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/opensim | John Hurliman | 2010-03-10 | 23 | -83/+455 |
| |\ \ | |||||
| | * | | 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 | 14 | -37/+64 |
| | | | | |||||
| | * | | Changed a cryptic debug message and a wrong comment | Diva Canto | 2010-03-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed caching of user accounts. | Diva Canto | 2010-03-09 | 3 | -32/+42 |
| | | | | |||||
| | * | | Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator | Melanie | 2010-03-09 | 2 | -9/+27 |
| | | | | | | | | | | | | | | | | to use that stored value. | ||||
| * | | | * 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 | ||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-03-15 | 19 | -2754/+1669 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-03-14 | 1 | -2/+5 |
| |\ \ \ | |||||
| | * | | | Fix the delay in llGiveInventory so that it only takes effect when giving ↵ | CasperW | 2010-03-13 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | inventory to an avatar (this now replicates SL behaviour) | ||||
| * | | | | RotLookAt repaired; debug msg cleanup. | Kitto Flora | 2010-03-14 | 4 | -444/+151 |
| |/ / / | |||||
| * | | | Fix Rotation Lock. NOTE: This version had poor border crossing control | Kitto Flora | 2010-03-12 | 2 | -24/+18 |
| | | | | |||||
| * | | | Resolved merge | Kitto Flora | 2010-03-12 | 59 | -6280/+2711 |
| |\ \ \ | |||||
| | * | | | Small consistency change | Melanie | 2010-03-07 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-03-06 | 3 | -655/+84 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | careminster | ||||
| | * \ \ \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 59 | -6167/+2733 |
| | |\ \ \ \ | |||||
| | | * | | | | - implementing server 1.38 functions | unknown | 2010-03-06 | 5 | -10/+119 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | | * | | | | Remove a superfluous array creation | Melanie | 2010-03-04 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Dynamics Integration Part 1 | Kitto Flora | 2010-03-11 | 3 | -1756/+1644 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Fix Physics angular reference frame. | Kitto Flora | 2010-03-04 | 3 | -655/+84 |
| |/ / / / |