aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-080-0/+0
|\
| * Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+29
* | Merge branch 'master' into careminsterMelanie2012-03-0835-233/+326
|\ \ | |/
| * Move "change region" command into general categoryJustin Clark-Casey (justincc)2012-03-081-1/+1
| * Uses shorter AddCommand form for "show estates"Justin Clark-Casey (justincc)2012-03-081-1/+1
| * Display help commander topics in capitalized form - the commands themselves a...Justin Clark-Casey (justincc)2012-03-083-45/+14
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-081-4/+1
| |\
| * | Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-0835-192/+316
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-084-180/+96
|\ \ \
| * | | Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+30
| * | | changes on undo/redo (untested/incomplete). Think we may consider moving thi...UbitUmarov2012-03-073-153/+66
* | | | Merge branch 'master' into careminsterMelanie2012-03-075-22/+25
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-074-20/+25
| |\ \ \ | | | |/ | | |/|
| | * | minor: make NPC tests run in a given order, comment out log lines in mock reg...Justin Clark-Casey (justincc)2012-03-074-20/+25
| * | | Always zero the PhysActor on dupes to prevent side effects on the orignal primMelanie2012-03-071-4/+1
| |/ /
* | | Fix merge issueMelanie2012-03-071-76/+79
* | | Merge branch 'master' into careminsterMelanie2012-03-0724-107/+453
|\ \ \ | |/ /
| * | Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-075-35/+36
| * | Add documentation to make more explicit the difference between OnRezScript an...Justin Clark-Casey (justincc)2012-03-071-5/+20
| * | Remove static m_MainInstance in LocalGridServiceConnector.Justin Clark-Casey (justincc)2012-03-061-24/+10
| * | Add sensor, dataserver requests, timer and listener counts to "xengine status...Justin Clark-Casey (justincc)2012-03-068-12/+136
| * | Remove unnecessary explicit ElapsedEventHandler in SimReporterJustin Clark-Casey (justincc)2012-03-061-1/+1
| * | Explictly close down the StatsReporter so that we can shutdown its timerJustin Clark-Casey (justincc)2012-03-062-0/+8
| * | Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()Justin Clark-Casey (justincc)2012-03-061-8/+14
| * | Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that ...Justin Clark-Casey (justincc)2012-03-068-26/+228
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-0710-803/+871
|\ \ \ | | |/ | |/|
| * | Prevent scripted region crossings from crashing with prim limits enabledMelanie2012-03-061-1/+7
| * | Null PhysActor on SOP.Copy() to prevent clobbering the original oneMelanie2012-03-061-4/+3
| * | Removed some whitespace errors - don't be naughty, don't use hard tabs!Melanie2012-03-061-11/+0
| * | make copied parts have diferent LocalIds than original. More building control...UbitUmarov2012-03-062-5/+74
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-063-7/+27
| |\ \
| * | | update ubitOdeUbitUmarov2012-03-054-78/+297
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-052-3/+15
| |\ \ \
| * | | | update UbitOdeUbitUmarov2012-03-045-65/+69
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-041-0/+2
| |\ \ \ \
| * | | | | update UbitODEUbitUmarov2012-03-043-36/+55
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-031-5/+3
| |\ \ \ \ \
| * | | | | | update ubitODEUbitUmarov2012-03-021-15/+45
| * | | | | | ubitODE bug fixUbitUmarov2012-02-291-1/+1
| * | | | | | update ubitODE to current working stateUbitUmarov2012-02-292-113/+199
| * | | | | | fixUbitUmarov2012-02-291-1/+3
| * | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-293-0/+28
| |\ \ \ \ \ \
| * | | | | | | chODE: bad meshs get a a basic box or sphere geom with setted prim size. They...UbitUmarov2012-02-292-503/+148
* | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-062-62/+57
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix off by one error in script error reporting.Justin Clark-Casey (justincc)2012-03-061-1/+1
| * | | | | | | Simplify NPCModuleTests code by putting the NPCModule in an instance variable...Justin Clark-Casey (justincc)2012-03-061-61/+56
* | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-062-12/+57
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Go back to setting appearance directly in NPCModule.SetAppearance() to fix ma...Justin Clark-Casey (justincc)2012-03-062-9/+57
* | | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-064-10/+42
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Allow NPC to be removed by the owner of the parcel they're over.Melanie2012-03-051-2/+9