Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Explictly close down the StatsReporter so that we can shutdown its timer | Justin Clark-Casey (justincc) | 2012-03-06 | 2 | -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-06 | 1 | -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-06 | 8 | -26/+228 | |
| | | | | | | | | | | | | | | | | | | | | | | | | they're running | |||||
* | | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-07 | 10 | -803/+871 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | careminster | |||||
| * | | | | | Prevent scripted region crossings from crashing with prim limits enabled | Melanie | 2012-03-06 | 1 | -1/+7 | |
| | | | | | | ||||||
| * | | | | | Null PhysActor on SOP.Copy() to prevent clobbering the original one | Melanie | 2012-03-06 | 1 | -4/+3 | |
| | | | | | | ||||||
| * | | | | | Removed some whitespace errors - don't be naughty, don't use hard tabs! | Melanie | 2012-03-06 | 1 | -11/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Also removed commented code block. | |||||
| * | | | | | make copied parts have diferent LocalIds than original. More building ↵ | UbitUmarov | 2012-03-06 | 2 | -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 ubitwork | UbitUmarov | 2012-03-06 | 3 | -7/+27 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | update ubitOde | UbitUmarov | 2012-03-05 | 4 | -78/+297 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-05 | 2 | -3/+15 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | update UbitOde | UbitUmarov | 2012-03-04 | 5 | -65/+69 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-04 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | update UbitODE | UbitUmarov | 2012-03-04 | 3 | -36/+55 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-03 | 1 | -5/+3 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | update ubitODE | UbitUmarov | 2012-03-02 | 1 | -15/+45 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | ubitODE bug fix | UbitUmarov | 2012-02-29 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | update ubitODE to current working state | UbitUmarov | 2012-02-29 | 2 | -113/+199 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix | UbitUmarov | 2012-02-29 | 1 | -1/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-29 | 3 | -0/+28 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | chODE: bad meshs get a a basic box or sphere geom with setted prim size. ↵ | UbitUmarov | 2012-02-29 | 2 | -503/+148 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They will not colide if non-physical and Will collide with land if physical. assume UNTESTED | |||||
* | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-06 | 2 | -62/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Fix off by one error in script error reporting. | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Simplify NPCModuleTests code by putting the NPCModule in an instance ↵ | Justin Clark-Casey (justincc) | 2012-03-06 | 1 | -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 careminster | Melanie | 2012-03-06 | 2 | -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-06 | 2 | -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 ↵ | Melanie | 2012-03-06 | 4 | -10/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | careminster | |||||
| * | | | | | | | | | | Allow NPC to be removed by the owner of the parcel they're over. | Melanie | 2012-03-05 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow NPC creation unless the prim owner has rez rights. | |||||
| * | | | | | | | | | | Teleport users to the cornfield when they are teleported with | Melanie | 2012-03-05 | 1 | -3/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llTeleportAgentHome(). Don't try to teleport NPCs. | |||||
| * | | | | | | | | | | llListSort SL compatibility: When sorting strided list and the list | Melanie | 2012-03-05 | 1 | -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 llCastRay | Melanie | 2012-03-05 | 1 | -0/+5 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | A stab at making llEjectFromLand work in all cases | Melanie | 2012-03-05 | 1 | -3/+10 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-06 | 4 | -7/+169 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Updates to MSSQL store for 0.7.3 to include: | Chris Hart | 2012-03-06 | 4 | -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 ↵ | Melanie | 2012-03-04 | 24 | -697/+1338 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | careminster | |||||
| * | | | | | | | | Zero velocity when drag-copying | Melanie | 2012-03-04 | 1 | -0/+2 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | This still causes terrain artefacts | Melanie | 2012-03-02 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert " fix my bug on ChODE terrain heightmap build" This reverts commit aa77d1d486f11da7dc841190f1ca85e085d0d648. | |||||
| * | | | | | | | This still causes terrain artefacts | Melanie | 2012-03-02 | 1 | -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 llTeleportAgent | Melanie | 2012-02-28 | 3 | -1/+7 | |
| | | | | | | | ||||||
| * | | | | | | Implement llTeleportAgent | Melanie | 2012-02-28 | 1 | -0/+22 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | made box a little larger | UbitUmarov | 2012-02-28 | 1 | -6/+6 | |
| | | | | | | ||||||
| * | | | | | A few blind changes to go try to go around bad mesh little box replacement fail | UbitUmarov | 2012-02-28 | 1 | -67/+50 | |
| | | | | | | ||||||
| * | | | | | Really dirty hack to make sims start. Causes errors but the ting runs. Remove | Melanie | 2012-02-28 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | when fixed right. | |||||
| * | | | | | Let inworld meshs colide as such and not as basic prim all the time. ↵ | UbitUmarov | 2012-02-27 | 2 | -5/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Removed also LOD, and outerskin on colision meshs. | |||||
| * | | | | | Merge branch 'ubitwork' | Melanie | 2012-02-27 | 4 | -568/+378 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | update ubitODE to my current working state | UbitUmarov | 2012-02-27 | 4 | -568/+378 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-27 | 10 | -41/+93 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-26 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix vehicles going physical stopping llTargetOmega parts (boat radar) | Melanie | 2012-02-27 | 1 | -3/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix NPC appearance setting to include attachments again | Melanie | 2012-02-27 | 1 | -1/+4 | |
| | |_|/ / / / / | |/| | | | | | |