Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove the reading of estate_settings.xml and the associated processing of | Melanie | 2010-03-22 | 2 | -2/+2 |
| | | | | | defaults. Adding code to facilitate estate creation / managemment as part of first time start up | ||||
* | Fix a nullref in permissions when returning objects via right-click | Melanie | 2010-03-20 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-19 | 6 | -102/+112 |
|\ | |||||
| * | 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. | ||||
* | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 20 | -38/+38 |
| | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. | ||||
* | | Cleaned up access to scenepresences in scenegraph. GetScenePresences and ↵ | Dan Lake | 2010-03-19 | 19 | -479/+348 |
|/ | | | | GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>). | ||||
* | 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 |
|\ | |||||
| * | 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 |
| |\ | |||||
| * | | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 5 | -58/+60 |
| | | | | | | | | | | | | AttachmentsModule | ||||
* | | | * 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 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-12 | 5 | -44/+56 |
|\ \ | |/ | |||||
| * | 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 |
| | | |||||
* | | * 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 | ||||
* | 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. | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-09 | 6 | -9/+10 |
| |\ | |||||
| * | | - parcel blocking, region crossing blocking, teleport blocking | unknown | 2010-03-09 | 7 | -11/+328 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | * 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 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-09 | 1 | -3/+9 |
|\ \ | |/ | |||||
| * | Add config option for switching between CSJ2K and BuggyJPEG. | Melanie | 2010-03-08 | 1 | -3/+9 |
| | | |||||
* | | * Typo fixes | John Hurliman | 2010-03-09 | 6 | -9/+10 |
|/ | | | | * Performance improvement in the expensive GenerateClientFlags() | ||||
* | * Added code to support either CSJ2K or OpenJPEG texture decoding. Currently ↵ | John Hurliman | 2010-03-07 | 1 | -20/+33 |
| | | | | hardcoded to CSJ2K (so no functional change) but this could easily be switched to a config option | ||||
* | Small consistency change | Melanie | 2010-03-07 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-06 | 4 | -13/+38 |
|\ | |||||
| * | Bug fix: store correct position information upon logout. Fixes mantis #4608 | Diva Canto | 2010-03-06 | 4 | -13/+38 |
| | | |||||
* | | - supporting llTextBox | unknown | 2010-03-06 | 7 | -3/+89 |
|/ | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-06 | 14 | -380/+572 |
|\ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-03-05 | 3 | -20/+28 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-05 | 7 | -238/+499 |
| | |\ | |||||
| | * | | * Cache packed throttle data to avoid repeated allocations in ↵ | John Hurliman | 2010-03-05 | 2 | -15/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 Hurliman | 2010-03-05 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | causing a flood of child updates to neighbors on login * Removed an unnecessary call to the presence service | ||||
| * | | | Justin, I must have been dyslexic when I wrote UserGridService as the name ↵ | Diva Canto | 2010-03-05 | 1 | -16/+16 |
| | |/ | |/| | | | | | | | for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere. | ||||
| * | | refactor: Move DetachSingleAttachmentToInv to region module | Justin Clark-Casey (justincc) | 2010-03-06 | 6 | -78/+82 |
| | | | | | | | | | | | | need to rationalize method names later |