Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 3 | -11/+68 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-08-31 | 1 | -1/+1 |
| |\ | |||||
| | * | Implementing a vastly simpler means of allowing region modules to access ↵ | SignpostMarv | 2012-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | GetLinkParts than mantis 6236 | ||||
| * | | formatting | SignpostMarv | 2012-08-31 | 1 | -5/+5 |
| | | | |||||
| * | | adding support for static method script invocations | SignpostMarv | 2012-08-31 | 2 | -2/+24 |
| | | | |||||
| * | | moving assignment to new line to make next commit easier to read in diffs | SignpostMarv | 2012-08-31 | 1 | -1/+2 |
| | | | |||||
| * | | using specific type instead of var | SignpostMarv | 2012-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | formatting | SignpostMarv | 2012-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | formatting | SignpostMarv | 2012-08-31 | 1 | -2/+1 |
| | | | |||||
| * | | adding support for finding static methods | SignpostMarv | 2012-08-31 | 1 | -3/+9 |
| | | | |||||
| * | | assign binding flags to variable | SignpostMarv | 2012-08-31 | 1 | -1/+3 |
| | | | |||||
| * | | no need to assign result to GetMethodInfoFromType | SignpostMarv | 2012-08-31 | 1 | -3/+1 |
| | | | |||||
| * | | changing to use Type argument instead of object | SignpostMarv | 2012-08-31 | 1 | -3/+3 |
| | | | |||||
| * | | moving code that will be common into private static method | SignpostMarv | 2012-08-31 | 1 | -1/+8 |
| | | | |||||
| * | | adding documentation to script invokation methods | SignpostMarv | 2012-08-31 | 1 | -0/+22 |
| |/ | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 16 | -290/+566 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | ||||
| * | Replace SendBannedUserList with Avination's version. Untested in core. Not ↵ | Melanie | 2012-08-31 | 1 | -25/+32 |
| | | | | | | | | even test compiled. | ||||
| * | Also do other MySQL region settings related calls under m_dbLock, in common ↵ | Justin Clark-Casey (justincc) | 2012-08-31 | 1 | -117/+130 |
| | | | | | | | | with other calls. | ||||
| * | Do Windlight storage and removal calls in MySQL under m_dbLock, as is done ↵ | Justin Clark-Casey (justincc) | 2012-08-31 | 1 | -102/+108 |
| | | | | | | | | with all the other database calls. | ||||
| * | Make ReuseDynamicTextures an experimental config setting in [Textures]. ↵ | Justin Clark-Casey (justincc) | 2012-08-30 | 2 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | Default is false, as before. If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them. This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable). Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry). If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated. CUrrently experimental. Default is false, as before. | ||||
| * | If the compile-time DynamicTextureModule.ReuseTextures flag is set, check ↵ | Justin Clark-Casey (justincc) | 2012-08-30 | 1 | -43/+59 |
| | | | | | | | | metadata still exists for any reused asset in case some other process has removed it from the cache. | ||||
| * | fixing bug where last element in list is ignored | SignpostMarv | 2012-08-30 | 1 | -1/+1 |
| | | |||||
| * | refactoring as the list funcs either skip invalid values or recall ToDoubleList | SignpostMarv | 2012-08-30 | 1 | -12/+11 |
| | | |||||
| * | Renaming existing 'torture' tests to 'performance' tests instead, since this ↵ | Justin Clark-Casey (justincc) | 2012-08-29 | 5 | -14/+14 |
| | | | | | | | | | | | | | | better matches what they really do. nant target name changes to test-perf instead of torture, to match test-stress still not run by default | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-08-29 | 5 | -2/+49 |
| |\ | |||||
| | * | This partially implements the LSL function to set the response | Mic Bowman | 2012-08-29 | 5 | -2/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | type for an HTTP request. Since the "official" LSL function limits the use of the response type, it is implemented as osSetContentType with a string for the content mime type and a threat level of high. With this function you should be able to implement rather functional media-on-a-prim application with much less difficulty. | ||||
| * | | Add VectorRenderModuleStressTests that contains a long running test that ↵ | Justin Clark-Casey (justincc) | 2012-08-29 | 3 | -1/+184 |
| |/ | | | | | | | | | | | | | | | generates thousands of vector textures concurrently. Intended for use if there are future issues with mono crashes whilst generate dynamic textures. This test is triggered via a new test-stress nant target. Not run by default. | ||||
* | | 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 |
| | | | | |