aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-0422-695/+1305
|\ \ \ | |/ / | | | | | | 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.
| * | Let inworld meshs colide as such and not as basic prim all the time. ↵UbitUmarov2012-02-272-5/+10
| | | | | | | | | | | | Removed also LOD, and outerskin on colision meshs.
| * | Merge branch 'ubitwork'Melanie2012-02-274-568/+378
| |\ \
| | * | update ubitODE to my current working stateUbitUmarov2012-02-274-568/+378
| | | |
| * | | Fix vehicles going physical stopping llTargetOmega parts (boat radar)Melanie2012-02-271-3/+5
| | | |
| * | | Fix NPC appearance setting to include attachments againMelanie2012-02-271-1/+4
| |/ /
| * | Merge branch 'ubitwork'Melanie2012-02-262-3/+41
| |\ \
| | * | added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh ↵UbitUmarov2012-02-262-3/+41
| | | | | | | | | | | | | | | | data.
| | * | Implement KeyframedMotion selection behaviorMelanie2012-02-263-2/+37
| | | |
| * | | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-262-0/+18
| | | | | | | | | | | | | | | | periodically.
| * | | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-267-39/+52
| | | | | | | | | | | | | | | | other way because SOG doesn't technically exist in the DB
| * | | Implement proper selection behaviorMelanie2012-02-263-2/+37
| |/ /
| * | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the newMelanie2012-02-265-11/+9
| | | | | | | | | | | | code.
| * | Fix an infinite recursion caused by checking the wrong values forMelanie2012-02-261-24/+27
| | | | | | | | | | | | Buoyancy, Force and Torque
| * | Serialize Keyframe motion for region crossingsMelanie2012-02-264-4/+96
| | |
| * | Zero force and torque on take so that items don't run away when rezzedMelanie2012-02-261-0/+2
| | |
| * | Merge branch 'ubitwork'Melanie2012-02-263-35/+98
| |\ \
| | * | changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵UbitUmarov2012-02-253-35/+98
| | | | | | | | | | | | | | | | Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
| * | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-269-2/+493
| |/ /
| * | Delay the sending of the initial werables update until the inventory andMelanie2012-02-252-8/+12
| | | | | | | | | | | | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login
| * | Merge branch 'ubitwork'Melanie2012-02-241-5/+21
| |\ \
| | * | replace bad meshs by a small cube and log it.UbitUmarov2012-02-241-5/+21
| | | |
| * | | Try not to send the avatar updates on login. This may mean loggin in withMelanie2012-02-241-1/+2
| |/ / | | | | | | | | | invisible attachments again but could help the appearance issues.
| * | stop using useless geom tricallback.UbitUmarov2012-02-241-1/+2
| | |
| * | Prevent a nullref when nonphysical motion objects cross sim boundariesMelanie2012-02-231-1/+1
| | |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-232-6/+9
| |\ \
| * | | Correct sit position calculationsMelanie2012-02-231-2/+2
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-041-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * | | comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-0312-221/+193
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Remove outdated comment about checking attachment prims in ↵Justin Clark-Casey (justincc)2012-03-021-3/+1
| | | | | | | | | | | | | | | | Scene.PipeEventsForScript()
| * | | Allow a script to receive events if its root prim is in an area where it's ↵Justin Clark-Casey (justincc)2012-03-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed to run rather than checking its own prim. This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion!
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-022-4/+12
| |\ \ \
| | * | | minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-03-021-2/+1
| | | | |
generated by cgit v1.1 at 2024-12-24 08:20:30 +0000