aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-09-031-44/+3
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * formattingSignpostMarv2012-09-031-2/+2
| |
| * no need to assign rotation to a variable nowSignpostMarv2012-09-031-2/+1
| |
| * made setting rotation match Second LifeSignpostMarv2012-09-031-32/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-09-029-321/+961
|\ \ | |/
| * BulletSim: Update BulletSimAPI to match the DLL interface.Robert Adams2012-08-314-137/+231
| | | | | | | | | | | | | | | | Major rework of terrain management which finally makes mega-regions work. Update heightmap of terrain by rebuilding the terrain's body and shape. There is a problem with just replacing the shape so this workaround will do for the moment but it will need to be resolved for mesh and hull switching.
| * BulletSim: clean up some variable naming for consistancy.Robert Adams2012-08-314-102/+183
| | | | | | | | | | | | | | Update DLL API for new terrain and shape/body pattern methods. Terrain creation and modification uses new shape/body pattern. Move debug logging callback set to initialization call so logging is per physics engine.
| * BulletSim: fix line endings.Robert Adams2012-08-311-22/+22
| |
| * BulletSim: Changes to terrain storage and management so mega-regions work.Robert Adams2012-08-318-185/+597
| | | | | | | | | | | | | | | | | | Moved all terrain code out of BSScene and into new BSTerrainManager. Added logic to manage multiple terrains for mega-regions. Added new functions to BulletSimAPI to match the library. Moved all of the terrain creation and setup logic from C++ code to C# code. The unused code has not yet been removed from either place. Soon. Moved checks for avatar above ground and in bounds into BSCharacter.
| * BulletSim: unify physical objects under BSPhysObjects. Now BSScene and ↵Robert Adams2012-08-315-160/+200
| | | | | | | | BSLinkset only know of BSPhysObject's and there is only one list to search in BSScene.
| * BulletSim: add new interface for mesh, hull and terrain creation that will ↵Robert Adams2012-08-311-7/+20
| | | | | | | | move nearly all of the logic into the C# code.
* | Merge branch 'master' into careminsterMelanie2012-08-311-1/+1
|\ \ | |/
| * Type.Type is RuntimeTypeSignpostMarv2012-08-311-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-08-313-11/+68
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-311-1/+1
| |\
| | * Implementing a vastly simpler means of allowing region modules to access ↵SignpostMarv2012-08-311-1/+1
| | | | | | | | | | | | GetLinkParts than mantis 6236
| * | formattingSignpostMarv2012-08-311-5/+5
| | |
| * | adding support for static method script invocationsSignpostMarv2012-08-312-2/+24
| | |
| * | moving assignment to new line to make next commit easier to read in diffsSignpostMarv2012-08-311-1/+2
| | |
| * | using specific type instead of varSignpostMarv2012-08-311-1/+1
| | |
| * | formattingSignpostMarv2012-08-311-1/+1
| | |
| * | formattingSignpostMarv2012-08-311-2/+1
| | |
| * | adding support for finding static methodsSignpostMarv2012-08-311-3/+9
| | |
| * | assign binding flags to variableSignpostMarv2012-08-311-1/+3
| | |
| * | no need to assign result to GetMethodInfoFromTypeSignpostMarv2012-08-311-3/+1
| | |
| * | changing to use Type argument instead of objectSignpostMarv2012-08-311-3/+3
| | |
| * | moving code that will be common into private static methodSignpostMarv2012-08-311-1/+8
| | |
| * | adding documentation to script invokation methodsSignpostMarv2012-08-311-0/+22
| |/
* | Merge branch 'master' into careminsterMelanie2012-08-318-57/+120
|\ \ | |/ | | | | | | | | | | | | 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.
| * Make ReuseDynamicTextures an experimental config setting in [Textures]. ↵Justin Clark-Casey (justincc)2012-08-301-1/+4
| | | | | | | | | | | | | | | | | | | | 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
| |
| * 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.
* | Merge branch 'avination' into careminsterMelanie2012-08-3111-216/+742
|\ \
| * \ 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-293-64/+116
| | | | |
| | | * | [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-287-114/+310
| | | | | | | | | | | | | | | | | | | | 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
| | |/ /