| Commit message (Expand) | Author | Age | Files | Lines |
* | Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken | Melanie | 2011-10-12 | 1 | -12/+6 |
* | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 2 | -1/+35 |
|\ |
|
| * | Start recording object updates per second statistic (analogue of agent update... | Justin Clark-Casey (justincc) | 2011-10-11 | 2 | -1/+35 |
* | | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Add other region stats (total frame time, physics fps, etc.) currently missin... | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -1/+1 |
* | | Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge | Melanie | 2011-10-12 | 1 | -13/+13 |
|\ \
| |/ |
|
| * | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiom... | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -13/+13 |
* | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 1 | -13/+0 |
|\ \
| |/ |
|
| * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t... | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -13/+0 |
* | | Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmerge | Melanie | 2011-10-12 | 1 | -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-08 | 1 | -2/+6 |
* | | Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log message | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
* | | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge | Melanie | 2011-10-12 | 3 | -51/+51 |
|\ \
| |/ |
|
| * | Fixed line endings from previous commit | Dan Lake | 2011-10-06 | 3 | -51/+51 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 1 | -9/+2 |
| |\ |
|
* | \ | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 4 | -88/+78 |
|\ \ \
| |/ / |
|
| * | | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 4 | -88/+78 |
* | | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge | Melanie | 2011-10-12 | 1 | -9/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | remove the pointless slashes on the end of the (5!) different server stat ret... | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -9/+2 |
| |/ |
|
* | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 1 | -11/+10 |
|\ \
| |/ |
|
| * | Simplified IsInTransit property on ScenePresence and removed InTransit() whic... | Dan Lake | 2011-10-06 | 1 | -11/+10 |
* | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge | Melanie | 2011-10-12 | 1 | -3/+0 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 4 | -60/+57 |
| |\ |
|
* | \ | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge | Melanie | 2011-10-12 | 1 | -255/+266 |
|\ \ \
| |/ / |
|
| * | | Refactor ScenePresence so gets and sets are through properties. Added private... | Dan Lake | 2011-10-06 | 1 | -287/+288 |
* | | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge | Melanie | 2011-10-12 | 4 | -36/+21 |
|\ \ \
| | |/
| |/| |
|
| * | | Instead of adding stat agentMS in all kinds of places, calculate it instead i... | Justin Clark-Casey (justincc) | 2011-10-06 | 4 | -36/+21 |
* | | | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge | Melanie | 2011-10-12 | 3 | -24/+36 |
|\ \ \
| |/ / |
|
| * | | Make reported sim fps more accurate, in line with frame time ms | Justin Clark-Casey (justincc) | 2011-10-05 | 3 | -24/+36 |
| |/ |
|
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-12 | 15 | -283/+467 |
|\ \ |
|
| * \ | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 1 | -27/+10 |
| |\ \
| | |/ |
|
| | * | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... | Dan Lake | 2011-10-04 | 1 | -22/+9 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-03 | 2 | -47/+48 |
| | |\ |
|
| * | \ | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 2 | -32/+7 |
| |\ \ \
| | |/ / |
|
| | * | | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 2 | -30/+7 |
| * | | | Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+13 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Animation-States Turning Left, Turning Right implemented/enabled | Pixel Tomsen | 2011-10-04 | 1 | -2/+6 |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -2/+2 |
| | |\ \
| | | |/ |
|
| * | | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 1 | -40/+44 |
| |\ \ \
| | |/ / |
|
| | * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -45/+42 |
| * | | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -2/+2 |
| | |/ |
|
| * | | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge | Melanie | 2011-10-11 | 4 | -17/+1 |
| |\ \
| | |/ |
|
| | * | Remove unimplementated UpdateMovement() methods from SOG, SOP. | Justin Clark-Casey (justincc) | 2011-10-01 | 4 | -17/+1 |
| * | | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+9 |
| |\ \
| | |/ |
|
| | * | minor: remove clutter null check from pass in config to AvatarFactoryModule.I... | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -0/+9 |
| * | | Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+5 |
| |\ \
| | |/ |
|
| | * | Add en_US culture setting to the async delete to inventory thread, to avoid a... | Justin Clark-Casey (justincc) | 2011-09-26 | 1 | -0/+5 |
| * | | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge | Melanie | 2011-10-11 | 2 | -1/+14 |
| |\ \
| | |/ |
|