aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminsterMelanie2009-12-311-2/+17
|\ \ | |/
| * Readds llCollisionFilter and adds llPassCollision.Revolution2009-12-311-2/+17
| | | | | | | | | | | | Applied with whitespace cleanup Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2009-12-311-44/+4
|\ \ | |/
| * This patch caused serialization errors and needs to be reexaminedMelanie2009-12-311-44/+4
| | | | | | | | | | | | Revert "[PATCH] Adds llCollisionFilter" This reverts commit eab2b4c6a96cd5b2a0f079f27a9c2ac15273d3f0.
* | Merge branch 'master' into careminsterMelanie2009-12-314-4/+141
|\ \ | |/
| * [PATCH] Adds llCollisionFilterMelanie2009-12-311-4/+44
| | | | | | | | Thank you, Revolution. Applied with minor changes.
| * Adds osKickUser and osSetSpeedunknown2009-12-313-0/+97
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Fix an omission in LSL that causes a viewer crashMelanie2009-12-301-0/+5
| |
* | Fix an omission in LSL that causes a viewer crashMelanie2009-12-301-0/+5
| |
* | Fix a timer list locking issue causing XMREngine deadlocksMelanie2009-12-301-15/+17
| |
* | Merge branch 'master' into casperCasperW2009-12-262-2/+40
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-251-0/+4
| |\ \ | | |/
| | * Clear Shape.SculptEntry if prim type is not a sculptie in ↵dahlia2009-12-241-0/+4
| | | | | | | | | | | | llSetPrimitiveParams() - addresses Mantis #4462
| | * Add the LSL List Size propertyMelanie2009-12-241-1/+40
| | |
| * | Add the body to the LSL List Size propertyMelanie2009-12-241-2/+36
| | |
* | | Add a debugger tag to stop Visual Studio from breakingCasperW2009-12-231-0/+1
|/ /
* | Merge branch 'master' of ssh://TOR/var/git/careminsterCasperW2009-12-236-90/+122
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-222-0/+9
| |\ \ | | |/
| | * Remove GetState. It is really unused and was reinstated by the revertMelanie2009-12-221-7/+0
| | |
| | * Revert "Remove an insterface member that was never used"Melanie2009-12-222-0/+16
| | | | | | | | | | | | | | | | | | | | | It was used. By the API, which is dynamically loaded. So it didn't complain until it hit Bamboo This reverts commit 33d5018e94e52cb875bf43bced623bdc6aa41ef0.
| * | Merge branch 'master' into careminsterMelanie2009-12-222-17/+0
| |\ \ | | |/
| | * Remove an insterface member that was never usedMelanie2009-12-222-16/+0
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-225-75/+98
| |\ \ | | |/
| | * FINALLY! Script compile errors now appear in the script error pane,Melanie2009-12-225-75/+98
| | | | | | | | | | | | not in a funky debug window.
| | * Add a data path for error messagesroot2009-12-221-0/+5
| | | | | | | | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com>
| * | Add a data path for error messagesroot2009-12-221-0/+5
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-221-1/+0
| |\ \ | | |/
| | * Glue code for a couple of new LSL function implementationsMelanie2009-12-221-2/+4
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-211-7/+20
| |\ \ | | |/
| | * Fixes some incorrect values returned by llGetPrimitiveParams() and ↵Jeff Lee2009-12-211-7/+20
| | | | | | | | | | | | | | | | | | osGetLinkPrimitiveParams(). Signed-off-by: Melanie <melanie@t-data.com>
* | | Added some null reference and deleted group checks to certain functions to ↵CasperW2009-12-231-29/+85
|/ / | | | | | | fix region crash scenarios.
* | Merge branch 'master' into careminsterMelanie2009-12-211-18/+29
|\ \ | |/
| * Script State Fix: Part 2Melanie2009-12-211-16/+20
| | | | | | | | | | | | Change the reader to wrap old-style definitions in new style wrappers. Change importer to not check irrelevant data that can't be reconstructed This removes the last bit of knowledge of XEngine's .state files from core.
| * Remove extra checking on the itemID of saved state, since it changes duringMelanie2009-12-211-4/+5
| | | | | | | | rez from inventory.
| * Script State Fix: Step 1Melanie2009-12-211-0/+6
| | | | | | | | | | Add Engine=xxx attribute and check for it's presence. Ignore state data written bby another engine
* | Merge branch 'master' into careminsterMelanie2009-12-201-2/+2
|\ \ | |/
| * random drive-by minor math optimization. No need for concern, bitshed was ↵dahlia2009-12-151-2/+2
| | | | | | | | within acceptable limits
* | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.CasperW2009-12-173-180/+229
| |
* | Merge branch 'master' into careminsterMelanie2009-12-151-3/+3
|\ \ | |/
| * Prevent OSSL from crashing if the sim was loaded from a remote config andMelanie2009-12-151-3/+3
| | | | | | | | osGetGridName, osGetGridNick or osGetGridLoginURI is used.
* | Merge branch 'master' into careminsterMelanie2009-12-143-0/+26
|\ \ | |/
| * * Mistaken ThreatLevel classification on osGetSimulatorMemory - should have ↵Adam Frisby2009-12-131-1/+1
| | | | | | | | been MODERATE.
| * * Implements OSSL function: osGetSimulatorMemory - returns the current ↵Adam Frisby2009-12-133-0/+25
| | | | | | | | | | | | | | | | amount of memory allocated to the simulator process (Moderate Threat Level). * Cleans redundant information out of the Simulator Version. Versions now look like: "OpenSimulator 0.6.9(dev) Unix/Mono" * [Minor] additional log info for MySQLInventoryData
| * Eliminate multiple updates on link/unlinkMelanie2009-12-061-0/+8
| |
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-12-101-0/+2
|\ \ | | | | | | | | | careminster
* | | Move osFunctions into a new Careminster script interfaceCasperW2009-12-098-387/+597
| | |
* | | Enable scripting interface for windlightunknown2009-12-094-1/+387
| | |
* | | Fix to existing ReaderWriterLockSlim implementationsCasperW2009-12-061-2/+8
| | |
* | | Eliminate multiple updates on link/unlinkMelanie2009-12-061-0/+8
| | |
* | | Convert multiple lock()s which directly hinder script performance in ↵CasperW2009-11-302-172/+254
| | | | | | | | | | | | linksets to ReaderWriterLockSlim.