aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork'Melanie2012-03-094-112/+194
|\
| * more changes on undo/redo group scaling seems to work betterUbitUmarov2012-03-092-14/+9
| * more changes in undo/redo. Basicly moved control to llclientview.cs. later w...UbitUmarov2012-03-093-100/+187
* | 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
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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-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
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
| |\ \ \ \ \ \ \ \