| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+3 | |
| |\ \ | |/ | ||||||
| | * | Allow monitoring of stats by region name | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge | Melanie | 2011-10-12 | 16 | -21/+326 | |
| |\ \ | |/ | ||||||
| | * | Add other region stats (total frame time, physics fps, etc.) currently ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 16 | -21/+326 | |
| | | | | | | | | | | | | | | | missing from MonitorModule Unlike the other 3 stats mechanisms, monitor data can be queried per individual region, which makes this useful. This doesn't affect an of the existing monitored stats. | |||||
| * | | Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmerge | Melanie | 2011-10-12 | 3 | -15/+15 | |
| |\ \ | |/ | ||||||
| | * | Convert getLastReportedSimFPS() and getLastReportedSimStats() into more ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 3 | -15/+15 | |
| | | | | | | | | | idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter | |||||
| * | | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge | Melanie | 2011-10-12 | 1 | -15/+35 | |
| |\ \ | |/ | ||||||
| | * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -15/+35 | |
| | | | | | | | | | Default is currently on since this is the historical setting | |||||
| * | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 3 | -15/+2 | |
| |\ \ | |/ | ||||||
| | * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵ | Justin Clark-Casey (justincc) | 2011-10-10 | 3 | -15/+2 | |
| | | | | | | | | | | | | | 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 '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge | Melanie | 2011-10-12 | 1 | -6/+4 | |
| |\ \ | |/ | ||||||
| | * | remove unused LastAssetID from DynamicTextureUpdaer | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -6/+4 | |
| | | | ||||||
| * | | Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge | Melanie | 2011-10-12 | 1 | -2/+4 | |
| |\ \ | |/ | ||||||
| | * | Tweak to language of last commit in rejecting UUID.Zero in ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | GridService.RegisterRegion() Allowing regions with UUID.Zero causes problems elsewhere according to http://opensimulator.org/mantis/view.php?id=3426 It's probably a bad idea to allow these in any case. | |||||
| * | | Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+2 | |
| |\ \ | |/ | ||||||
| | * | GridService - Region UUID can not be NULL | Pixel Tomsen | 2011-10-08 | 1 | -0/+2 | |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=3426 | |||||
| * | | Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge | Melanie | 2011-10-12 | 1 | -39/+1 | |
| |\ \ | |/ | ||||||
| | * | Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -39/+1 | |
| | | | | | | | | | | | | | check on XMLRPC RemoteAdmin handlers. If admin is disabled then the XMLRPC handlers are never registered, which means that they cannot be called anyway. | |||||
| * | | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge | Melanie | 2011-10-12 | 1 | -5/+5 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||||
| | * | replace List used by m_accessIP in RemoteAdminPlugin with the more efficient ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -5/+4 | |
| | | | | | | | | | HashSet | |||||
| * | | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge | Melanie | 2011-10-12 | 1 | -124/+116 | |
| |\ \ | |/ | ||||||
| | * | Add option to allow only explicitly listed IPs to access RemoteAdmin facilities. | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -124/+116 | |
| | | | | | | | | | | | | | Also adds password check to some functions where this was missing and fixes some parameter checking. This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me. Thanks Michelle Argus. | |||||
| * | | 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. | |||||
| * | | Adjust CM version tag | Melanie | 2011-10-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | flip master version up to 0.7.3 | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-10-07 | 1 | -1/+1 | |
| | |\ | ||||||
| * | \ | Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+17 | |
| |\ \ \ | |/ / | ||||||
| | * | | Add note to docs | BlueWall | 2011-10-07 | 1 | -0/+17 | |
| | | | | | | | | | | | | | | | | This method is used by externasl/3rd party management tools to create users and they depend on us to generate the UUID. | |||||
| * | | | 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 | 3 | -13/+6 | |
| | |\ | ||||||
| * | \ | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 5 | -89/+79 | |
| |\ \ \ | |/ / | ||||||
| | * | | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 5 | -89/+79 | |
| | | | | | | | | | | | | | | | | | | | 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 | 3 | -13/+6 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | remove the pointless slashes on the end of the (5!) different server stat ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 3 | -13/+6 | |
| | |/ | | | | | | | | | | | | | 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 branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-06 | 3 | -301/+312 | |
| | |\ | ||||||
| * | \ | Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmerge | Melanie | 2011-10-12 | 1 | -2/+3 | |
| |\ \ \ | |/ / | ||||||
| | * | | WebStats - Home Link Fix | Pixel Tomsen | 2011-10-06 | 1 | -2/+3 | |
| | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=4536 | |||||
| * | | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 2 | -17/+16 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Simplified IsInTransit property on ScenePresence and removed InTransit() ↵ | Dan Lake | 2011-10-06 | 2 | -17/+16 | |
| | | | | | | | | | | | | | 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 | 8 | -109/+87 | |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | | | HACK: Remove advanced property resending until it is fixed properly in core. | Melanie | 2011-10-12 | 1 | -10/+14 | |
| | | | | | ||||||
| * | | | | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge | Melanie | 2011-10-12 | 2 | -265/+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 '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+11 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |