Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | refactor: move another AttachObject method | Justin Clark-Casey (justincc) | 2010-03-05 | 2 | -45/+46 |
| | | | |||||
| * | | refactor: move user inventory side of RezSingleAttachment to module | Justin Clark-Casey (justincc) | 2010-03-05 | 3 | -29/+43 |
| | | | |||||
| * | | refactor: begin to move attachments code into a region module | Justin Clark-Casey (justincc) | 2010-03-05 | 6 | -102/+205 |
| | | | |||||
| * | | add initial UserGrid service classes as per diva's direction | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -0/+139 |
| |/ | | | | | | | | | this will initially store home location data instead of the presence service compiles but not enough to actually test yet | ||||
| * | Fix LocalPresenceServiceConnector test now that the hardcoded test data has ↵ | Justin Clark-Casey (justincc) | 2010-03-05 | 4 | -14/+20 |
| | | | | | | | | | | | | | | | | been removed from Data.Null.NullPresenceData Unfortunately, this meant publicly exposing the underlying service for the connector. The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config. Unfortunately, this would require a lot of work in this case but might be the better way forward. | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-05 | 1 | -1/+0 |
| |\ | |||||
| * | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵ | Justin Clark-Casey (justincc) | 2010-03-04 | 4 | -108/+25 |
| | | | | | | | | | | | | modules can use it | ||||
* | | | - implementing server 1.38 functions | unknown | 2010-03-06 | 5 | -10/+119 |
| |/ |/| | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-04 | 10 | -135/+227 |
|\ \ | |/ | |||||
| * | compiler warnings revealed that public PlaySoundSlavePrims properties were ↵ | Justin Clark-Casey (justincc) | 2010-03-03 | 2 | -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 warnings | Justin Clark-Casey (justincc) | 2010-03-03 | 1 | -7/+7 |
| | | |||||
| * | refactor: push sog.SendPartFullUpdate() down into sop where it better belongs | Justin Clark-Casey (justincc) | 2010-03-03 | 2 | -45/+43 |
| | | | | | | | | no functional changes |