aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix merge issueMelanie2012-03-071-76/+79
|
* Merge branch 'master' into careminsterMelanie2012-03-0724-107/+453
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Stop individually deleting objects at the end of each ObjectTortureTest.Justin Clark-Casey (justincc)2012-03-075-35/+36
| | | | | | | | | | | | We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests. This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in). Slightly simplifies config read in Scene constructor to help facilitate this.
| * Add documentation to make more explicit the difference between OnRezScript ↵Justin Clark-Casey (justincc)2012-03-071-5/+20
| | | | | | | | | | | | | | and OnNewScript in the event manager OnNewScript fires when a script is added to a scene OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.)
| * Remove static m_MainInstance in LocalGridServiceConnector.Justin Clark-Casey (justincc)2012-03-061-24/+10
| | | | | | | | | | I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case. Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled.
| * Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-068-12/+136
| | | | | | | | | | | | status" command. This is for diagnostic purposes.
| * 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
| | | | | | | | This is another step necessary for the scene to be garbage collected between performance tests
| * Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()Justin Clark-Casey (justincc)2012-03-061-8/+14
| | | | | | | | | | | | | | They were all failing assertions but the exceptions these threw were caught as expected Exceptions. I don't think we can easily distinguish these from the Exceptions that we're expecting. So for now we'll do some messy manually checking with boolean setting instead. This patch also corrects the assertions themselves.
| * Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that ↵Justin Clark-Casey (justincc)2012-03-068-26/+228
| | | | | | | | they're running
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-0710-803/+871
|\ \ | | | | | | | | | careminster
| * | 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
| | | | | | | | | | | | Also removed commented code block.
| * | make copied parts have diferent LocalIds than original. More building ↵UbitUmarov2012-03-062-5/+74
| | | | | | | | | | | | control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
| * | 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. ↵UbitUmarov2012-02-292-503/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They will not colide if non-physical and Will collide with land if physical. assume UNTESTED
* | | | | | | | 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 ↵Justin Clark-Casey (justincc)2012-03-061-61/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variable rather than making each test fetch it seperately. Also rename instance variables in the test to conform to naming standards and for understandability
* | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-062-12/+57
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | | | | | Go back to setting appearance directly in NPCModule.SetAppearance() to fix ↵Justin Clark-Casey (justincc)2012-03-062-9/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mantis 5914 The part reverted is from commit 2ebb421. Unfortunately, IAvatarFactoryModule.SetAppearance() does not transfer attachments. I'm not sure how to do this separately, unfortunately I'll need to leave it to Dan :) Regression test added for this case. Mantis ref: http://opensimulator.org/mantis/view.php?id=5914
* | | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-064-10/+42
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | careminster
| * | | | | | | Allow NPC to be removed by the owner of the parcel they're over.Melanie2012-03-051-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow NPC creation unless the prim owner has rez rights.
| * | | | | | | Teleport users to the cornfield when they are teleported withMelanie2012-03-051-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llTeleportAgentHome(). Don't try to teleport NPCs.
| * | | | | | | llListSort SL compatibility: When sorting strided list and the listMelanie2012-03-051-2/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | length is not a multiple of the stride, return the original list. Also, enforce that sort is ascending only when the ascending parameter is 1, and not when it is != 0
| * | | | | | SL compatibility - return only points on segemtn, not ray in llCastRayMelanie2012-03-051-0/+5
| | | | | | |
| * | | | | | A stab at making llEjectFromLand work in all casesMelanie2012-03-051-3/+10
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-064-7/+169
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Updates to MSSQL store for 0.7.3 to include:Chris Hart2012-03-064-7/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Telehub support * Bugfix to Friends lookups * Updates to Creator fields to store up to 255 characters for HG item creator storage
* | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-0424-697/+1338
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | careminster
| * | | | | Zero velocity when drag-copyingMelanie2012-03-041-0/+2
| | |_|_|/ | |/| | |
| * | | | This still causes terrain artefactsMelanie2012-03-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert " fix my bug on ChODE terrain heightmap build" This reverts commit aa77d1d486f11da7dc841190f1ca85e085d0d648.
| * | | | This still causes terrain artefactsMelanie2012-03-021-3/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Revert " fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1." This reverts commit 15bc539bd49e7a09c1ec6e539871cde5eee6032e.
| * | | Fix and hook up llTeleportAgentMelanie2012-02-283-1/+7
| | | |
| * | | Implement llTeleportAgentMelanie2012-02-281-0/+22
| | |/ | |/|
| * | made box a little largerUbitUmarov2012-02-281-6/+6
| | |
| * | A few blind changes to go try to go around bad mesh little box replacement failUbitUmarov2012-02-281-67/+50
| | |
| * | Really dirty hack to make sims start. Causes errors but the ting runs. RemoveMelanie2012-02-281-1/+5
| | | | | | | | | | | | when fixed right.
generated by cgit v1.1 at 2024-12-27 06:20:51 +0000