aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-073-30/+50
|\
| * 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 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
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-072-15/+72
|\ \
| * | 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://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-061-3/+10
|\ \ \ | |/ /
| * | 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-047-42/+592
|\ \ \ | |/ /
| * | Zero velocity when drag-copyingMelanie2012-03-041-0/+2
| * | Fix vehicles going physical stopping llTargetOmega parts (boat radar)Melanie2012-02-271-3/+5
| * | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-261-0/+12
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-265-25/+38
| * | Implement proper selection behaviorMelanie2012-02-263-2/+37
| * | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the newMelanie2012-02-264-9/+7
| * | Fix an infinite recursion caused by checking the wrong values forMelanie2012-02-261-24/+27
| * | Serialize Keyframe motion for region crossingsMelanie2012-02-264-4/+96
| * | Merge branch 'ubitwork'Melanie2012-02-263-35/+98
| |\ \
| | * | changed SOP Force and Torque, adding XML (de/)serialization, also changed Bu...UbitUmarov2012-02-253-35/+98
| * | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-263-0/+330
| |/ /
| * | Delay the sending of the initial werables update until the inventory andMelanie2012-02-251-2/+1
| * | Try not to send the avatar updates on login. This may mean loggin in withMelanie2012-02-241-1/+2
| * | Prevent a nullref when nonphysical motion objects cross sim boundariesMelanie2012-02-231-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-03-033-98/+28
|\ \ \ | | |/ | |/|
| * | Remove outdated comment about checking attachment prims in Scene.PipeEventsFo...Justin Clark-Casey (justincc)2012-03-021-3/+1
| * | Allow a script to receive events if its root prim is in an area where it's al...Justin Clark-Casey (justincc)2012-03-021-4/+1
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-021-2/+1
| |\ \
| | * | minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-03-021-2/+1
| * | | ScenePresence line endings and fix AllowMovement default to true.Dan Lake2012-03-021-30/+30
| |/ /
| * | In ScenePresence, removed several private variables used to store public para...Dan Lake2012-03-011-108/+44
* | | Merge branch 'master' into careminsterMelanie2012-02-242-22/+12
|\ \ \ | |/ / | | / | |/ |/|
| * Take watchdog alarm calling back outside the m_threads lock.Justin Clark-Casey (justincc)2012-02-241-2/+2
| * Get rid of some of the identical exception catching in Scene.Update().Justin Clark-Casey (justincc)2012-02-241-17/+1
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-3/+9
| * Try to resolve some problems with viewers crashing after hitting parcel banli...Justin Clark-Casey (justincc)2012-02-232-10/+20
* | Partially apply the core banlines fixMelanie2012-02-232-6/+9
* | Fix preserving the animation state of a crossing seated avatarMelanie2012-02-231-2/+10
* | Properly sequence updates of avatars and attachments so that we don'tMelanie2012-02-231-0/+3
* | Merge branch 'master' into careminsterMelanie2012-02-232-10/+7
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-231-8/+2
| |\
| | * Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in con...Justin Clark-Casey (justincc)2012-02-221-8/+2
| * | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-232-2/+5
| |/
* | Adjust sit target and the llSetLinkPrimitiveParams sit position hackMelanie2012-02-221-2/+22
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+9
|\ \ | |/
| * Restore the taskItem null check that I accidentally blatted in 5397a6dJustin Clark-Casey (justincc)2012-02-211-0/+9
* | Merge branch 'master' into careminsterMelanie2012-02-211-16/+2
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-211-11/+1