aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2009-12-235-3/+28
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-235-3/+23
| |\
| | * Thank you kindly, Ziah for a patch that adds the channel to the class ↵Charles Krinke2009-12-234-2/+16
| | | | | | | | | | | | | | | | | | ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts. Signed-off-by: Charles Krinke <cfk@pacbell.net>
| | * Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the ↵Diva Canto2009-12-221-1/+7
| | | | | | | | | | | | stream can be closed.
| * | Fix a bounds exception I came across in IAR restoreMelanie2009-12-231-0/+5
| |/
* | 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-225-6/+44
| | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2009-12-225-6/+44
|\ \
| * | Add a data path for error messagesroot2009-12-225-6/+44
| | |
* | | Fix conflictsKitto Flora2009-12-2212-20/+69
|\ \ \ | |/ /
| * | Should not commit without compilingroot2009-12-221-1/+1
| | |
| * | Jumped the gun...root2009-12-221-1/+1
| | |
| * | Allow 100ms for scripts to run attach(NULL_KEY) on detachroot2009-12-221-0/+12
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-229-17/+31
| |\ \ | | |/
| | * Glue code for a couple of new LSL function implementationsMelanie2009-12-2213-5/+237
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-213-9/+34
| |\ \ | | |/
| | * When a script has been loaded, remove it's state entry, so recompilingMelanie2009-12-211-0/+1
| | | | | | | | | | | | doesn't pick up the old state again.
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-211-2/+13
| | |\
| | | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-12-211-8/+32
| | | |\
| | | * | Bug fix: in standalone, HGInventoryBroker needs to get the local inventory ↵Diva Canto2009-12-211-2/+13
| | | | | | | | | | | | | | | | | | | | server URL from NetworkServersInfo.
| | * | | Fixes some incorrect values returned by llGetPrimitiveParams() and ↵Jeff Lee2009-12-211-7/+20
| | | |/ | | |/| | | | | | | | | | | | | | | | | osGetLinkPrimitiveParams(). Signed-off-by: Melanie <melanie@t-data.com>
* | | | Include ChOdePluginKitto Flora2009-12-2213-118/+10524
|/ / /
* | | Merge branch 'master' into careminsterMelanie2009-12-211-8/+32
|\ \ \ | |/ /
| * | Patch from Ziah.Melanie2009-12-211-8/+32
| |/ | | | | | | | | Mantis #4456: Patch to implement some minor MRM Functions : SitTarget, SitTargetText, TouchText and Text
* | Merge branch 'master' into casperCasperW2009-12-219-57/+107
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-213-26/+78
| |\ \ | | |/
| | * Script State Fix: Part 2Melanie2009-12-213-24/+69
| | | | | | | | | | | | | | | | | | 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-205-9/+20
| |\ \ | | |/
| | * Fix a case where an idle sim can eat 100% of a coreMelanie2009-12-201-1/+1
| | |
| | * * Bug fix in HG: preserve the home region coordinates across multiple HG TPs.Diva Canto2009-12-192-3/+14
| | | | | | | | | | | | * Removed unnecessary debug messages.
| | * random drive-by minor math optimization. No need for concern, bitshed was ↵dahlia2009-12-151-2/+2
| | | | | | | | | | | | within acceptable limits
| | * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-12-151-3/+3
| | |
| * | Merge branch 'casper'CasperW2009-12-203-132/+6
| |\ \
| * \ \ Merge branch 'tests'Kitto Flora2009-12-191-22/+9
| |\ \ \
| | * | | Fix mantis #10 & #14Kitto Flora2009-12-191-23/+10
| | | | |
* | | | | Fixed a nasty crash in StandUp() that occurred when the part got killed with ↵CasperW2009-12-211-13/+41
| |_|/ / |/| | | | | | | | | | | an avatar sitting on it.
* | | | Reverted my changes to jhurliman's packet stack since it currently causes ↵CasperW2009-12-203-132/+6
|/ / / | | | | | | | | | more problems than it resolves. The stack DOES need a rework particularly with regards to priorities, but this is not it.
* | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.CasperW2009-12-176-231/+321
| | |
* | | Fix GetWorldRotation(), and a host of related Sit fixes.Kitto Flora2009-12-173-38/+43
| | |
* | | Merge branch 'tests'Kitto Flora2009-12-161-2/+8
|\ \ \ | |/ /
| * | Fix prim linking bug, Manis #14Kitto Flora2009-12-151-2/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2009-12-152-4/+4
|\ \ \ | |/ / |/| / | |/