aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-188-202/+235
|\
| * Unify a previous refactor of object return with the older solution. WeMelanie2010-03-182-26/+10
| | | | | | | | really don't need two methods doing the same thing, but differently.
| * Inconsistent locking of ScenePresence array in SceneGraph. Fixed by ↵Dan Lake2010-03-176-165/+211
| | | | | | | | | | | | 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-161-17/+0
| |
| * Fixed several unhandled exceptions and performance issues with ↵John Hurliman2010-03-161-11/+12
| | | | | | | | 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
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-155-92/+40
| |\
| * | * UuidGatherer now tracks asset types for assets it discovers. The asset ↵John Hurliman2010-03-152-16/+17
| | | | | | | | | | | | | | | | | | types are inferred from context * OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
* | | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-182-26/+10
| | | | | | | | | | | | 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-1510-166/+116
|\ \ \ | | |/ | |/|
| * | add a null check in ScenePresence constructordahlia2010-03-131-1/+2
| | |
| * | refactor: Move another RezSingleAttachment() from Scene.Inventory to ↵Justin Clark-Casey (justincc)2010-03-124-36/+27
| | | | | | | | | | | | AttachmentsModule
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-121-0/+1
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-123-43/+22
| | |\
| | * | * Added a better check to the SimianGrid connectors to test if they are ↵John Hurliman2010-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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-124-58/+14
| | |/ | |/| | | | | | | AttachmentsModule
| * | refactor: move client invoked AttachObject from SceneGraph to AttachmentsModuleJustin Clark-Casey (justincc)2010-03-123-43/+22
| |/
| * Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12Justin Clark-Casey (justincc)2010-03-121-9/+4
| | | | | | | | | | | | 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-107-28/+293
| |\
| | * Formatting cleanup. Add copyright notices.Jeff Ames2010-03-106-20/+47
| | |
| | * Cache UserLevel in ScenePresence on SP creation. Change IsAdministratorMelanie2010-03-091-9/+19
| | | | | | | | | | | | 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-153-67/+57
|\ \ \
| * | | RotLookAt repaired; debug msg cleanup.Kitto Flora2010-03-142-35/+4
| | | |
| * | | Resolved mergeKitto Flora2010-03-1215-226/+761
| |\ \ \
| | * \ \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-0615-210/+761
| | |\ \ \
| | | * | | - implementing server 1.38 functionsunknown2010-03-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | | | | Dynamics Integration Part 1Kitto Flora2010-03-111-1/+10
| |/ / / /
* | | | | Cache UserLevel in ScenePresence on SP creation. Change IsAdministratorMelanie2010-03-091-9/+19
| | | | | | | | | | | | | | | | | | | | to use that stored value.
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-094-1/+26
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-091-1/+229
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-063-1/+21
| |\ \ \
| | * | | Bug fix: store correct position information upon logout. Fixes mantis #4608Diva Canto2010-03-063-1/+21
| | | | |
| * | | | - supporting llTextBoxunknown2010-03-061-0/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | | - parcel blocking, region crossing blocking, teleport blockingunknown2010-03-091-0/+229
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-068-270/+119
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-067-258/+114
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-054-233/+95
| | |\ \ \
| | | * | | refactor: Move DetachSingleAttachmentToInv to region moduleJustin Clark-Casey (justincc)2010-03-064-61/+23
| | | | | | | | | | | | | | | | | | | | | | | | need to rationalize method names later
| | | * | | refactor: move another AttachObject methodJustin Clark-Casey (justincc)2010-03-051-44/+0
| | | | | |
| | | * | | refactor: move user inventory side of RezSingleAttachment to moduleJustin Clark-Casey (justincc)2010-03-052-29/+13
| | | | | |
| | | * | | refactor: begin to move attachments code into a region moduleJustin Clark-Casey (justincc)2010-03-054-99/+59
| | | | | |
| | * | | | * Cache packed throttle data to avoid repeated allocations in ↵John Hurliman2010-03-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵Justin Clark-Casey (justincc)2010-03-042-16/+15
| | | | | | | | | | | | | | | | | | | | modules can use it
| * | | | - implementing server 1.38 functionsunknown2010-03-061-0/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-048-139/+209
|\ \ \ \ | |/ / /
| * | | compiler warnings revealed that public PlaySoundSlavePrims properties were ↵Justin Clark-Casey (justincc)2010-03-032-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | changing the wrong protected fields. correcting these may resolve the sound problems seen recently on the mailing list, though not guaranteed.
| * | | minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-03-031-7/+7
| | | |
| * | | refactor: push sog.SendPartFullUpdate() down into sop where it better belongsJustin Clark-Casey (justincc)2010-03-032-45/+43
| | | | | | | | | | | | | | | | no functional changes