aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmergeMelanie2011-10-251-4/+0
|\
| * remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ...Justin Clark-Casey (justincc)2011-10-151-4/+0
* | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmergeMelanie2011-10-251-27/+21
|\ \ | |/
| * refactor: Remove redundant code in SOP.UpdatePrimFlags()Justin Clark-Casey (justincc)2011-10-151-27/+21
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-252-7/+18
|\ \ | |/
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-152-7/+18
* | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmergeMelanie2011-10-252-3/+3
|\ \ | |/
| * refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s...Justin Clark-Casey (justincc)2011-10-142-3/+3
* | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmergeMelanie2011-10-251-19/+33
|\ \ | |/
| * Expose minimum frame time and update periods for experimentation.Justin Clark-Casey (justincc)2011-10-131-19/+33
* | Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * refactor: Put the frame update period when temporary objects are cleaned up i...Justin Clark-Casey (justincc)2011-10-131-4/+4
* | Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmergeMelanie2011-10-251-29/+1
|\ \ | |/
| * refactor: chain the two scene constructors together to eliminate more copypastaJustin Clark-Casey (justincc)2011-10-131-29/+1
* | Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmergeMelanie2011-10-252-6/+13
|\ \ | |/
| * Tie reported FPS correction factor into the minimum frame time rather than se...Justin Clark-Casey (justincc)2011-10-132-6/+13
* | Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmergeMelanie2011-10-251-1/+12
|\ \ | |/
| * Move fps stat adjustment factor into field rather than hard-coded.Justin Clark-Casey (justincc)2011-10-131-1/+12
* | Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmergeMelanie2011-10-253-9/+1
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-10-123-44/+1
* | Fix ground sit autopilotMelanie2011-10-252-9/+19
* | Fake an AgentCircuitData if none is available rather than crashing outMelanie2011-10-241-2/+24
* | Allow updating the movement animation while flying. This fixes falling,Melanie2011-10-211-20/+6
* | Fix up the animator and ScenePresence to like each other againMelanie2011-10-202-7/+24
* | Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebrokenMelanie2011-10-121-12/+6
* | Merge branch 'master' into bigmergeMelanie2011-10-122-1/+35
|\ \ | |/
| * Start recording object updates per second statistic (analogue of agent update...Justin Clark-Casey (justincc)2011-10-112-1/+35
* | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * Add other region stats (total frame time, physics fps, etc.) currently missin...Justin Clark-Casey (justincc)2011-10-101-1/+1
* | Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmergeMelanie2011-10-121-13/+13
|\ \ | |/
| * Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiom...Justin Clark-Casey (justincc)2011-10-101-13/+13
* | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmergeMelanie2011-10-121-13/+0
|\ \ | |/
| * refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t...Justin Clark-Casey (justincc)2011-10-101-13/+0
* | Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmergeMelanie2011-10-121-2/+6
|\ \ | |/
| * Go back to lying that sim fps is 55 when it's actually locked at a maximum of...Justin Clark-Casey (justincc)2011-10-081-2/+6
* | Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log messageJustin Clark-Casey (justincc)2011-10-071-1/+1
* | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmergeMelanie2011-10-123-51/+51
|\ \ | |/
| * Fixed line endings from previous commitDan Lake2011-10-063-51/+51
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-061-9/+2
| |\
* | \ Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-124-88/+78
|\ \ \ | |/ /
| * | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-064-88/+78
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-9/+2
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ret...Justin Clark-Casey (justincc)2011-10-071-9/+2
| |/
* | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-121-11/+10
|\ \ | |/
| * Simplified IsInTransit property on ScenePresence and removed InTransit() whic...Dan Lake2011-10-061-11/+10
* | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmergeMelanie2011-10-121-3/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-064-60/+57
| |\
* | \ Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmergeMelanie2011-10-121-255/+266
|\ \ \ | |/ /
| * | Refactor ScenePresence so gets and sets are through properties. Added private...Dan Lake2011-10-061-287/+288
generated by cgit v1.1 at 2024-11-14 03:13:50 +0000