aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-094-4/+114
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-093-3/+78
| |\
| | * More on inventory transfer hold ups:Diva Canto2012-03-092-2/+77
| | * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-092-2/+2
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-084-88/+36
| | |\
| | * | More on the freeze on HG inventory transfers: spawn a threadlet on the funct...Diva Canto2012-03-081-1/+1
| * | | fix for NPC not playing internal animationssatguru srivastava2012-03-091-1/+36
| | |/ | |/|
* | | let chode and ubitode find ode.dll on windowsUbitUmarov2012-03-092-0/+7
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-0968-809/+1241
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-03-094-92/+40
| |\ \ \ | | |/ /
| | * | Simplify minimap coarse location code by just reference SP.AbsolutePositionJustin Clark-Casey (justincc)2012-03-092-12/+3
| | * | Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since t...Justin Clark-Casey (justincc)2012-03-091-2/+2
| | * | Use SP.ParentPart instead of ParentID in places where it's more efficient (sa...Justin Clark-Casey (justincc)2012-03-094-68/+32
| | * | refactor: cleanup SP.HandleAgentSit so that everything is done within one if ...Justin Clark-Casey (justincc)2012-03-091-15/+8
| | |/
| | * Remove a race condition from SP.Set_AbsolutePosition where we assume the Pare...Justin Clark-Casey (justincc)2012-03-091-5/+5
| | * FireAndForget scripted rez - port from AvinationMelanie2012-03-091-41/+46
| * | Merge branch 'master' into careminsterMelanie2012-03-091-2/+5
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-091-27/+29
| | |\
| | | * Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+29
| | * | Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-2/+5
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-024-40/+34
| | | |\
| | | * \ Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-022-110/+55
| | | |\ \
| | | * | | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-2/+5
| * | | | | Merge branch 'master' into careminsterMelanie2012-03-0826-184/+206
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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-0826-143/+196
| * | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-084-180/+96
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-071-2/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | 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-0720-100/+438
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-071-28/+21
| | * | | | | 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-0422-695/+1305
| |\ \ \ \ \ \ \