| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 1 | -13/+0 |
| |\ | |||||
| | * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -13/+0 |
| | | | | | | | | | | | | | than going through scene I know this goes against the law of demeter but I don't think it's that useful here and I'd rather get rid of nasty little wrapper methods | ||||
| * | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | of 11. We're been lying since 2008 so I'm sure another few years can't hurt. To know the real fps, either divide sim fps by 5 and/or look at the frame time. | ||||
| * | | 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 |
| | | | | | | | | | As per earlier discussions with dslake | ||||
| * | | 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 |
| | | | | | | | | | | | | | | | | | | | ways to access the list/dictionary of child regions and locking was inconsistent. There are now public properties which enforce locks. Callers are no longer required to create new copies of lists. | ||||
| * | | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -9/+2 |
| | |/ | | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path. | ||||
| * | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 1 | -11/+10 |
| |\ \ | |/ | |||||
| | * | Simplified IsInTransit property on ScenePresence and removed InTransit() ↵ | Dan Lake | 2011-10-06 | 1 | -11/+10 |
| | | | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit(). | ||||
| * | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge | Melanie | 2011-10-12 | 1 | -3/+0 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 4 | -60/+57 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | \ | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge | Melanie | 2011-10-12 | 1 | -255/+266 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Refactor ScenePresence so gets and sets are through properties. Added ↵ | Dan Lake | 2011-10-06 | 1 | -287/+288 |
| | | | | | | | | | | | | | private sets when needed. Removed redundant code when methods replicated what the set already does | ||||
| * | | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-10-06 | 4 | -36/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | in the main Scene.Update() loop, like the other stats Some of the places where agentMS was added were in separate threads launched by the update loop. I don't believe this is correct, since such threads are no longer contributing to frame time. Some of the places were also driven by client input rather than the scene loop. I don't believe it's appropriate to add this kind of stuff to scene loop stats. These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time | ||||
| * | | | 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 |
| | |/ | | | | | | | Also remove some unused fields and improve naming on others. | ||||
| * | | 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 |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | ||||
| | | * | Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵ | Dan Lake | 2011-10-04 | 1 | -22/+9 |
| | | | | | | | | | | | | | handlers for attachments to call public interface and rearranged module file into sections | ||||
| | | * | 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 |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | | Removed redundant code in AttachmentsModule and simplified interfaces which ↵ | Dan Lake | 2011-10-03 | 2 | -30/+7 |
| | | | | | | | | | | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still. | ||||
| | * | | | Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+13 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | ||||
| | | * | | Animation-States Turning Left, Turning Right implemented/enabled | Pixel Tomsen | 2011-10-04 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=3036 | ||||
| | | * | | 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 |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | | * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -45/+42 |
| | | | | | | | | | | | | | | | | | This appears to be code clutter since the code that uses this has long gone. | ||||
| | * | | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | ||||
| | | * | | 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 |
| | | | | | | | | | | | | | | | | SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase. No point making the code more complex until it actually needs to be, | ||||
| | * | | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+9 |
| | |\ \ | | |/ | |||||
| | | * | minor: remove clutter null check from pass in config to ↵ | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | AvatarFactoryModule.Initialize() This is never null | ||||
| | * | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-09-26 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | any issues with float serialization with machines set to non en_US locales. Doing this to see if addresses inventory object deserialization problems in http://opensimulator.org/mantis/view.php?id=5708, though if it does I'm really surprised not to have seen it before now. Really need to go through and systematically set the culture for every timer and change all BeginInvoke calls to FireAndForget instead. But don't want to do something like that this close to a release. | ||||
| | * | | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmerge | Melanie | 2011-10-11 | 2 | -1/+14 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | | * | Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ↵ | Snoopy Pfeffer | 2011-09-25 | 2 | -2/+11 |
| | | | | | | | | | | | | | are only sent to affected clients. | ||||
| | * | | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge | Melanie | 2011-10-11 | 1 | -14/+0 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | | * | remove unused SOP.Create() method | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -14/+0 |
| | | | | |||||
| | * | | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+5 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | ||||
| | | * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made. | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-09-21 | 4 | -7/+16 |
| | | |\ | |||||
| | * | \ | Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge | Melanie | 2011-10-11 | 1 | -5/+5 |
| | |\ \ \ | | |/ / | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |