| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-08-31 | 17 | -221/+751 |
| |\ | |||||
| | * | Merge branch 'ubitwork' into avination | Melanie | 2012-08-30 | 3 | -35/+38 |
| | |\ | |||||
| | | * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-08-30 | 2 | -12/+128 |
| | | |\ | |||||
| | | * | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacing | UbitUmarov | 2012-08-30 | 3 | -35/+38 |
| | | | | | | | | | | | | | | | | | | | | | fromdata(seralize). for now its called with null group since sop.copy() hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them. | ||||
| | * | | | Sequence inventory descendents requests to reduce inventory server load and | Melanie | 2012-08-30 | 2 | -5/+56 |
| | | | | | | | | | | | | | | | | | movement lag. | ||||
| | * | | | Allow llList2Key to also act on System.String | Melanie | 2012-08-29 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-29 | 8 | -151/+565 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Fix issue with the quit packet being stuck int he queue and a one packet delay. | Melanie | 2012-08-29 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | Also fix semaphore excetion caused by enqueueing while dequque is taking place. | ||||
| | | * | | Remove Justin's addition to avoid sending incoming packets to inactive clients | Melanie | 2012-08-29 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | This also causes the initial AgentUpdate to be rejected because our processing is asynchronous. | ||||
| | | * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-08-29 | 7 | -137/+435 |
| | | |\ \ | | | |/ | |||||
| | | | * | A few more changes to keyframes | UbitUmarov | 2012-08-29 | 4 | -65/+117 |
| | | | | | |||||
| | | | * | [Potentially broken] keyframes changes.. since it's there, use timer for | UbitUmarov | 2012-08-29 | 1 | -115/+165 |
| | | | | | | | | | | | | | | | | | crossing retries and not still another thread, etc... | ||||
| | | | * | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 8 | -115/+311 |
| | | | | | | | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing... | ||||
| | | * | | Add a queue with two priority levels. This is a drop in replacement for | Melanie | 2012-08-28 | 1 | -2/+111 |
| | | | | | | | | | | | | | | | | | the BlockingQueue from OMV, but allows two priorities. | ||||
| | | * | | Fix a nullref while object is being created | Melanie | 2012-08-28 | 1 | -1/+2 |
| | | |/ | |||||
| | | * | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal | UbitUmarov | 2012-08-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | DataFormat enum, using values from the KFM constants | ||||
| | | * | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-25 | 11 | -63/+174 |
| | | |\ | |||||
| | | * \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-19 | 3 | -1/+12 |
| | | |\ \ | |||||
| | * | | | | Make llCollisionSprite not throw anymore | Melanie | 2012-08-25 | 1 | -1/+2 |
| | | |_|/ | |/| | | |||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-24 | 6 | -5/+9 |
| | |\ \ \ | | |/ / | |||||
| | | * | | let setLinkPrimParams terminate even if there are no more parts. | UbitUmarov | 2012-08-16 | 1 | -2/+3 |
| | | | | | |||||
| | | * | | fix vs2010 build | UbitUmarov | 2012-08-16 | 5 | -3/+6 |
| | | | | | |||||
| | * | | | Remove debug spam | Melanie | 2012-08-24 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fix background inventory loading (Viewer 3) so it won't lag out the sim | Melanie | 2012-08-24 | 3 | -51/+107 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-08-29 | 21 | -167/+786 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | ||||
| | * | | | | implementing rule tracking | SignpostMarv | 2012-08-29 | 1 | -6/+9 |
| | | | | | | |||||
| | * | | | | track originating IScriptApi method for SL-like error messages. Will add ↵ | SignpostMarv | 2012-08-29 | 3 | -13/+17 |
| | | | | | | | | | | | | | | | | | | | | | rule number tracking in next commit. | ||||
| | * | | | | Fix regression introduced in a0d178b2 (Sat Aug 25 02:00:17 2012) where ↵ | Justin Clark-Casey (justincc) | 2012-08-29 | 10 | -52/+231 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders with asset type of 'Folder' and 'Unknown' were accidentally treated as system folders. This prevented more than one additional ordinary folder from being created in the base "My Inventory" user folder. Added regression test for this case. Switched tests to use XInventoryService with mostly implemented TestXInventoryDataPlugin rather than InventoryService Disabled TestLoadIarV0_1SameNameCreator() since this has not been working for a very long time (ever since XInventoryService) started being used since it doesnt' preserve creator data in the same way as InventoryService did and so effectively lost the OSPAs. However, nobody noticed/complained about this issue and OSPAs have been superseded by HG like creator information via the --home save oar/iar switch. | ||||
| | * | | | | Add experimental DynamicTextureModule.ReuseTextures flag, currently only ↵ | Justin Clark-Casey (justincc) | 2012-08-28 | 5 | -56/+310 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configurable on compile. Disabled (status quo) by default. This flag makes the dynamic texture module reuse cache previously dynamically generated textures given the same input commands and extra params for 24 hours. This occurs as long as those commands would always generate the same texture (e.g. they do not contain commands to fetch data from the web). This makes texture changing faster as a viewer-cached texture uuid is sent and may reduce simulator load in regions with generation of lots of dynamic textures. A downside is that this stops expiry of old temporary dynamic textures from the cache, Another downside is that a jpeg2000 generation that partially failed is currently not regenerated until restart or after 24 hours. | ||||
| | * | | | | Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). ↵ | Justin Clark-Casey (justincc) | 2012-08-28 | 3 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method. | ||||
| | * | | | | copying documentation from http://opensimulator.org/wiki/Threat_level | SignpostMarv | 2012-08-28 | 1 | -0/+59 |
| | | | | | | |||||
| | * | | | | adding some files to .gitignore that get generated when debugging in c# ↵ | SignpostMarv | 2012-08-27 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | express with OpenSim.32BitLaunch as the startup project | ||||
| | * | | | | formatting | SignpostMarv | 2012-08-27 | 1 | -22/+22 |
| | | | | | | |||||
| | * | | | | refactoring to load from self (fixes ChanneDigger being absent) | SignpostMarv | 2012-08-27 | 1 | -5/+11 |
| | | | | | | |||||
| | * | | | | refactoring to assign the first argument to a variable | SignpostMarv | 2012-08-27 | 1 | -4/+5 |
| | | | | | | |||||
| | * | | | | minor: Simplify return of vector render module name and some very minor ↵ | Justin Clark-Casey (justincc) | 2012-08-27 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | removal of unncessary syntax clutter | ||||
| | * | | | | Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams() | Justin Clark-Casey (justincc) | 2012-08-27 | 1 | -2/+32 |
| | | | | | | |||||
| | * | | | | Add VectorRenderModuleTests.TestRepeatDrawContainingImage() | Justin Clark-Casey (justincc) | 2012-08-27 | 1 | -0/+31 |
| | | | | | | |||||
| | * | | | | Add VectorRenderModuleTests.TestRepeatDraw() | Justin Clark-Casey (justincc) | 2012-08-27 | 1 | -11/+48 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-08-25 | 3 | -66/+110 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-25 | 10 | -49/+143 |
| | |\ \ \ \ | |||||
| | | * | | | | implementing PRIM_LINK_TARGET on GetPrimParams ala SetPrimParams | SignpostMarv | 2012-08-25 | 2 | -11/+60 |
| | | | | | | | |||||
| | * | | | | | Fix and refactor region registration. Reorder checks to short-curcuit ↵ | Melanie | 2012-08-25 | 1 | -25/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expensive and destructive ones. Properly fix region reservation and authentication. Make region moves and flags preservation work again as intended. Prevent failes reservation take-over from damging reservation data. | ||||
| * | | | | | | Minor formatting cleanup | Melanie | 2012-08-25 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge commit '58714b0aca71ce026226c6f76753905' into careminster | Melanie | 2012-08-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | | minor formatting | SignpostMarv | 2012-08-25 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge commit '5203665bb2d68c6a4e0ea3180334b607db6ab1ce' into careminster | Melanie | 2012-08-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | refactoring to local variable for cleaner code | SignpostMarv | 2012-08-25 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | refactoring to local variable for cleaner code | SignpostMarv | 2012-08-25 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Merge commit '2a2e120470ea530ea0a6f035c5cf28247f94532c' into careminster | Melanie | 2012-08-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |