aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 missing fileMelanie2009-12-221-0/+54
| |
| * Add a data path for error messagesroot2009-12-226-14/+57
| | | | | | | | | | | | 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/careminsterMelanie2009-12-2213-111/+10515
|\ \
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2009-12-226-14/+57
| |\ \
| * \ \ Fix conflictsKitto Flora2009-12-2214-20/+74
| |\ \ \
| * | | | Include ChOdePluginKitto Flora2009-12-2213-118/+10524
| | | | |
* | | | | Add missing fileMelanie2009-12-221-0/+54
| |_|/ / |/| | |
* | | | Add a data path for error messagesroot2009-12-226-14/+57
| |/ / |/| |
* | | 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-215-9/+39
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-211-0/+3
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-12-211-7/+20
| | |\
| | * | Bug fix: set the map image upon hyperlinking regions.Diva Canto2009-12-211-0/+3
| | | |
| * | | 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-212-2/+15
| |\ \ | | |/
| | * 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-212-2/+15
| | | | | | | | | | | | | | | | 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>
* | | Merge branch 'master' into careminsterMelanie2009-12-212-8/+33
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-211-0/+1
| |\ \ | | |/
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-12-214-27/+79
| | |\
| | * | Making the library read the item's flag, so that clothing items can have the ↵Diva Canto2009-12-211-0/+1
| | | | | | | | | | | | | | | | proper icons.
| * | | 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-2113-134/+190
|\ \ \
| * \ \ 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-208-85/+102
| |\ \ \ | | |/ /
| | * | 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-193-5/+16
| | | | | | | | | | | | * 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-152-6/+6
| | |
| | * Make sure that we catch and display any exceptions that get right to the top ↵Justin Clark-Casey (justincc)2009-12-151-46/+52
| | | | | | | | | | | | of our incoming http request handling stack
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-12-151-3/+3
| | |\
| | * | minor: make logging messages consistent in BaseHttpServerJustin Clark-Casey (justincc)2009-12-151-25/+25
| | | |
| * | | Merge branch 'casper'CasperW2009-12-203-132/+6
| |\ \ \
| * \ \ \ Merge branch 'tests'Kitto Flora2009-12-192-23/+10
| |\ \ \ \
| | * | | | Fix mantis #10 & #14Kitto Flora2009-12-192-24/+11
| | | | | |
generated by cgit v1.1 at 2024-12-17 19:47:56 +0000