Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -3/+18 |
|\ | |||||
| * | Add the view generating method to the image generator interface | Melanie | 2010-10-05 | 1 | -0/+5 |
| | | |||||
| * | Revert an accidental default value change | Melanie | 2010-10-05 | 1 | -1/+1 |
| | | |||||
| * | Patch to allow other cam angles. Not complete. Thanks, Antont. | Melanie | 2010-10-05 | 1 | -4/+14 |
| | | |||||
* | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -0/+6 |
|\ \ | |/ | |||||
| * | Avoid throwing errors when adding existing meshes to the render scene | Latif Khalifa | 2010-10-04 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 9 | -47/+1413 |
|\ \ | |/ | |||||
| * | Adapt to core changes | Melanie | 2010-10-03 | 1 | -1/+1 |
| | | |||||
| * | Addign the new / renamed files for previous commit | Melanie | 2010-10-03 | 8 | -0/+2655 |
| | | |||||
| * | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 5 | -1290/+1 |
| | | |||||
* | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 |
| | | |||||
* | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -1/+1 |
|/ | |||||
* | Reapplying the parts of the prior revert that were not derived from the | Melanie | 2010-10-02 | 1 | -1/+1 |
| | | | | original patch | ||||
* | Revert "Forward-port 0.6 fix" | Melanie | 2010-10-02 | 1 | -13/+1 |
| | | | | This reverts commit 90b51dc7d67507e27c4baa529e979de19dce8de1. | ||||
* | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -1/+13 |
| | |||||
* | Restrict top colliders / top scripts to estate managers | Melanie | 2010-09-27 | 1 | -0/+3 |
| | |||||
* | Consistency patch: use Path.Combine() instead of + and eliminate the need | Melanie | 2010-09-26 | 3 | -8/+9 |
| | | | | for a trailing slash on exports/ | ||||
* | Fix a minor economy issue | Melanie | 2010-09-25 | 1 | -1/+4 |
| | |||||
* | Fix a typo | Melanie | 2010-09-21 | 1 | -3/+3 |
| | |||||
* | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -5/+23 |
| | |||||
* | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 3 | -16/+3 |
| | | | | MapAndArray collection | ||||
* | Formatting cleanup. | Jeff Ames | 2010-09-12 | 10 | -142/+137 |
| | |||||
* | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 5 | -6/+7 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-08 | 1 | -1/+4 |
|\ | |||||
| * | * Cache null account responses in the SimianUserAccountServiceConnector to ↵ | John Hurliman | 2010-09-07 | 1 | -1/+4 |
| | | | | | | | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache | ||||
* | | If a scene object part UUID is changed (only possible when not in a scene), ↵ | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -1/+1 |
|/ | | | | then adjust the inventory items to point to the new uuid as well | ||||
* | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because | Melanie Thielker | 2010-09-06 | 1 | -3/+11 |
| | | | | modules need to see it (Search!) even if it comes in via CAPS | ||||
* | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -13/+0 |
| | | | | on IDwellModule | ||||
* | Move code that allows llGiveInvetory() to move item into appropriate system ↵ | Justin Clark-Casey (justincc) | 2010-09-04 | 1 | -1/+1 |
| | | | | | | | folder up from connectors into Scene.Inventory.cs This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway. | ||||
* | Implements parcel media setting persistence and packet / CAPS handling | Jonathan Freedman | 2010-08-30 | 2 | -2/+70 |
| | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 2 | -285/+287 |
| | |||||
* | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 3 | -281/+291 |
| | | | | conditions in linking and unlinking | ||||
* | Plumb the region type through to the ProductName field in estate messages | Melanie | 2010-08-24 | 1 | -0/+1 |
| | |||||
* | Work on TeleportStart: renamed method from TeleportLocationStart to ↵ | Diva Canto | 2010-08-16 | 1 | -3/+0 |
| | | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule). | ||||
* | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-13 | 3 | -16/+16 |
| | |||||
* | refactor: move Scene.PerformObjectBuy into BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -2/+167 |
| | |||||
* | Establish new Objects/BuySellModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -0/+98 |
| | | | | Move Scene.ObjectSaleInfo() to this | ||||
* | refactor: move Scene.TerrainUnAcked() handling into TerrainModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -1/+8 |
| | |||||
* | refactor: move more map tile generation code from scene to IWorldMapModule | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -2/+15 |
| | |||||
* | Correct display of landmark about info. Also correct region maturity rating | Melanie Thielker | 2010-08-07 | 1 | -1/+5 |
| | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity. | ||||
* | Merge branch 'moap' | Justin Clark-Casey (justincc) | 2010-08-06 | 2 | -2/+683 |
|\ | |||||
| * | Simplify serialized version string. Change element capitalization for ↵ | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -31/+45 |
| | | | | | | | | | | | | | | consistency THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database. This commit also improves locking for manipulation of media entries. | ||||
| * | get rid of PrimitiveBaseShape.MediaRaw staging post | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -34/+0 |
| | | | | | | | | | | using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself | ||||
| * | remove duplicated serialization code | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -55/+3 |
| | | |||||
| * | serialize media textures to inventory with a largely osd representation ↵ | Justin Clark-Casey (justincc) | 2010-08-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | rather than .net auto-serialization THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases. This makes media textures serialized in the same way, which is probably better in the long term. | ||||
| * | add userExposed parameter to part copy event | Justin Clark-Casey (justincc) | 2010-07-28 | 1 | -1/+1 |
| | | |||||
| * | relocate moap specific cloning code to MoapModule | Justin Clark-Casey (justincc) | 2010-07-28 | 1 | -0/+20 |
| | | |||||
| * | Fix problem where changes to media textures for prims duplicated by shify ↵ | Justin Clark-Casey (justincc) | 2010-07-28 | 2 | -15/+15 |
| | | | | | | | | | | | | copy would change both prims until server restart I also found out that you can crash the current viewer by giving it more media entrys than it's expecting | ||||
| * | comment out verbose debug logging | Justin Clark-Casey (justincc) | 2010-07-27 | 1 | -34/+36 |
| | | |||||
| * | make MoapModule ignore possible future media texture data that it can't handle | Justin Clark-Casey (justincc) | 2010-07-27 | 1 | -2/+4 |
| | |