Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 4 | -0/+10 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Make it possible to disable the HG linker. On non-HG systems it spits yellow | Melanie | 2011-10-12 | 4 | -0/+10 | |
| | | | | | | | | | | | | spam, so it should not load unless HG is desired. | |||||
* | | | Disable Flotsam groups messaging module in our config base | Melanie | 2011-10-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 2 | -2/+2 | |
|\ \ \ | |/ / | ||||||
| * | | Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled | Melanie | 2011-10-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | by default) the config default. This way it will work for current cases while allowing the use of other groups modules without config bloat. | |||||
| * | | Change default groups messaging module in hardcode to the empty string. | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |/ | | | | | | | | | Modules should not assume thet they are the one and only, but only be enabled when explicitly configured. | |||||
* | | 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 | 3 | -1/+43 | |
|\ \ | |/ | ||||||
| * | Start recording object updates per second statistic (analogue of agent ↵ | Justin Clark-Casey (justincc) | 2011-10-11 | 3 | -1/+43 | |
| | | | | | | | | | | | | updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor A useful diagnostic to find out how object updates are burdening a scene | |||||
* | | Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+1 | |
|\ \ | |/ | ||||||
| * | meaningless change to goose panda | Justin Clark-Casey (justincc) | 2011-10-11 | 1 | -0/+1 | |
| | | ||||||
* | | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmerge | Melanie | 2011-10-12 | 2 | -21/+32 | |
|\ \ | |/ | ||||||
| * | osSetParcelDetails - PARCEL_DETAILS_CLAIMDATE | Pixel Tomsen | 2011-10-11 | 2 | -21/+32 | |
| | | | | | | | | | | | | | | this new flag set parcels claim date value 0 for this flag set current unixstamp http://opensimulator.org/mantis/view.php?id=5725 | |||||
* | | 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 | 2 | -15/+40 | |
|\ \ | |/ | ||||||
| * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 2 | -15/+40 | |
| | | | | | | | | 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 | 2 | -5/+6 | |
|\ \ | |/ | | | | | | | 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 | 2 | -5/+5 | |
| | | | | | | | | HashSet | |||||
* | | Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge | Melanie | 2011-10-12 | 2 | -0/+2 | |
|\ \ | |/ | ||||||
| * | Improve explanation of access_ip_addresses in [RemoteAdmin] to say that ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 2 | -0/+2 | |
| | | | | | | | | there are no restrictions if not set | |||||
* | | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge | Melanie | 2011-10-12 | 3 | -124/+124 | |
|\ \ | |/ | ||||||
| * | Add option to allow only explicitly listed IPs to access RemoteAdmin facilities. | Justin Clark-Casey (justincc) | 2011-10-08 | 3 | -124/+124 | |
| | | | | | | | | | | | | 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 commit 'b5e6209cfd1c0b655852cf40e99f50aa2db9d8fa' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -0/+17 | |
| |\ | ||||||
* | \ | Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
|\ \ \ | |/ / | ||||||
| * | | Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | OpenSim.ini.example | |||||
* | | | Merge commit '1c548179778befb50ee7481be7ffc91f2d53fede' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | 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. |