aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-3116-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 ↵Melanie2012-08-311-25/+32
| | | | | | | | even test compiled.
| * Also do other MySQL region settings related calls under m_dbLock, in common ↵Justin Clark-Casey (justincc)2012-08-311-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-311-102/+108
| | | | | | | | with all the other database calls.
| * Make ReuseDynamicTextures an experimental config setting in [Textures]. ↵Justin Clark-Casey (justincc)2012-08-302-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-301-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 ignoredSignpostMarv2012-08-301-1/+1
| |
| * refactoring as the list funcs either skip invalid values or recall ToDoubleListSignpostMarv2012-08-301-12/+11
| |
| * Renaming existing 'torture' tests to 'performance' tests instead, since this ↵Justin Clark-Casey (justincc)2012-08-295-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/opensimJustin Clark-Casey (justincc)2012-08-295-2/+49
| |\
| | * This partially implements the LSL function to set the responseMic Bowman2012-08-295-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-293-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 careminsterMelanie2012-08-3117-221/+751
|\ \
| * \ Merge branch 'ubitwork' into avinationMelanie2012-08-303-35/+38
| |\ \
| | * \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-08-302-12/+128
| | |\ \
| | * | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-303-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 andMelanie2012-08-302-5/+56
| | | | | | | | | | | | | | | | | | | | movement lag.
| * | | | Allow llList2Key to also act on System.StringMelanie2012-08-291-1/+2
| | | | |
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-08-298-151/+565
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix issue with the quit packet being stuck int he queue and a one packet delay.Melanie2012-08-291-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 clientsMelanie2012-08-291-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 ubitworkMelanie2012-08-297-137/+435
| | |\ \ \ | | | |/ /
| | | * | A few more changes to keyframesUbitUmarov2012-08-294-65/+117
| | | | |
| | | * | [Potentially broken] keyframes changes.. since it's there, use timer forUbitUmarov2012-08-291-115/+165
| | | | | | | | | | | | | | | | | | | | crossing retries and not still another thread, etc...
| | | * | [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-288-115/+311
| | | | | | | | | | | | | | | | | | | | threads overlaps, some null objects exceptions, region crossing...
| | * | | Add a queue with two priority levels. This is a drop in replacement forMelanie2012-08-281-2/+111
| | | | | | | | | | | | | | | | | | | | the BlockingQueue from OMV, but allows two priorities.
| | * | | Fix a nullref while object is being createdMelanie2012-08-281-1/+2
| | |/ /
| | * | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internalUbitUmarov2012-08-261-2/+2
| | | | | | | | | | | | | | | | DataFormat enum, using values from the KFM constants
| | * | Merge branch 'avination' into ubitworkUbitUmarov2012-08-2511-63/+174
| | |\ \
| | * \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-08-193-1/+12
| | |\ \ \
| * | | | | Make llCollisionSprite not throw anymoreMelanie2012-08-251-1/+2
| | |_|/ / | |/| | |
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-08-246-5/+9
| |\ \ \ \ | | |/ / /
| | * | | let setLinkPrimParams terminate even if there are no more parts.UbitUmarov2012-08-161-2/+3
| | | | |
| | * | | fix vs2010 buildUbitUmarov2012-08-165-3/+6
| | | | |
| * | | | Remove debug spamMelanie2012-08-241-2/+2
| | | | |
| * | | | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-243-51/+107
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-08-2921-167/+786
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
| * | | | implementing rule trackingSignpostMarv2012-08-291-6/+9
| | | | |
| * | | | track originating IScriptApi method for SL-like error messages. Will add ↵SignpostMarv2012-08-293-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-2910-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-285-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-283-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_levelSignpostMarv2012-08-281-0/+59
| | | | |
| * | | | adding some files to .gitignore that get generated when debugging in c# ↵SignpostMarv2012-08-271-0/+4
| | | | | | | | | | | | | | | | | | | | express with OpenSim.32BitLaunch as the startup project
| * | | | formattingSignpostMarv2012-08-271-22/+22
| | | | |
| * | | | refactoring to load from self (fixes ChanneDigger being absent)SignpostMarv2012-08-271-5/+11
| | | | |
| * | | | refactoring to assign the first argument to a variableSignpostMarv2012-08-271-4/+5
| | | | |
| * | | | minor: Simplify return of vector render module name and some very minor ↵Justin Clark-Casey (justincc)2012-08-271-4/+3
| | | | | | | | | | | | | | | | | | | | removal of unncessary syntax clutter
| * | | | Add VectorRenderModule.TestRepeatSameDrawDifferentExtraParams()Justin Clark-Casey (justincc)2012-08-271-2/+32
| | | | |
| * | | | Add VectorRenderModuleTests.TestRepeatDrawContainingImage()Justin Clark-Casey (justincc)2012-08-271-0/+31
| | | | |