aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmergeMelanie2011-10-123-15/+15
|\
| * Convert getLastReportedSimFPS() and getLastReportedSimStats() into more ↵Justin Clark-Casey (justincc)2011-10-103-15/+15
| | | | | | | | idiomatic LastReportedSimFPS and LastReportedSimStats on SimStatsReporter
* | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmergeMelanie2011-10-122-15/+40
|\ \ | |/
| * Provide a way to turn the MonitorModule on and offJustin Clark-Casey (justincc)2011-10-102-15/+40
| | | | | | | | Default is currently on since this is the historical setting
* | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmergeMelanie2011-10-123-15/+2
|\ \ | |/
| * refactor: have lsl and ossl interrogate scene.StatsReporter directly rather ↵Justin Clark-Casey (justincc)2011-10-103-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 bigmergeMelanie2011-10-121-6/+4
|\ \ | |/
| * remove unused LastAssetID from DynamicTextureUpdaerJustin Clark-Casey (justincc)2011-10-101-6/+4
| |
* | Merge commit '156385f48b2b2829f2d427c72f269406c46019fa' into bigmergeMelanie2011-10-121-2/+4
|\ \ | |/
| * Tweak to language of last commit in rejecting UUID.Zero in ↵Justin Clark-Casey (justincc)2011-10-081-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 bigmergeMelanie2011-10-121-0/+2
|\ \ | |/
| * GridService - Region UUID can not be NULLPixel Tomsen2011-10-081-0/+2
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3426
* | Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmergeMelanie2011-10-121-39/+1
|\ \ | |/
| * Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() ↵Justin Clark-Casey (justincc)2011-10-081-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 bigmergeMelanie2011-10-122-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-082-5/+5
| | | | | | | | HashSet
* | Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmergeMelanie2011-10-122-0/+2
|\ \ | |/
| * Improve explanation of access_ip_addresses in [RemoteAdmin] to say that ↵Justin Clark-Casey (justincc)2011-10-082-0/+2
| | | | | | | | there are no restrictions if not set
* | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmergeMelanie2011-10-123-124/+124
|\ \ | |/
| * Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.Justin Clark-Casey (justincc)2011-10-083-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 bigmergeMelanie2011-10-121-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-081-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 tagMelanie2011-10-121-1/+1
| |
* | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * flip master version up to 0.7.3Justin Clark-Casey (justincc)2011-10-071-1/+1
| |
* | Merge commit 'b5e6209cfd1c0b655852cf40e99f50aa2db9d8fa' into bigmergeMelanie2011-10-120-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-071-0/+17
| |\
* | \ Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in ↵Justin Clark-Casey (justincc)2011-10-071-1/+1
| | | | | | | | | | | | OpenSim.ini.example
* | | Merge commit '1c548179778befb50ee7481be7ffc91f2d53fede' into bigmergeMelanie2011-10-120-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-10-071-1/+1
| |\ \ | | |/
* | | Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmergeMelanie2011-10-121-0/+17
|\ \ \ | |/ /
| * | Add note to docsBlueWall2011-10-071-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 bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log messageJustin Clark-Casey (justincc)2011-10-071-1/+1
| |/ | | | | | | As per earlier discussions with dslake
* | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmergeMelanie2011-10-123-51/+51
|\ \ | |/
| * Fixed line endings from previous commitDan Lake2011-10-063-51/+51
| |
* | Merge commit 'f26a966b8e79688ca2ed81c236492d694f34ac7d' into bigmergeMelanie2011-10-120-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-063-13/+6
| |\
* | \ Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-125-89/+79
|\ \ \ | |/ /
| * | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-065-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 bigmergeMelanie2011-10-123-13/+6
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ↵Justin Clark-Casey (justincc)2011-10-073-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 commit '4c812884be59d76039afee74725fc45981356f36' into bigmergeMelanie2011-10-120-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-063-301/+312
| |\
* | \ Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmergeMelanie2011-10-121-2/+3
|\ \ \ | |/ /
| * | WebStats - Home Link FixPixel Tomsen2011-10-061-2/+3
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=4536
* | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-122-17/+16
|\ \ \ | | |/ | |/|
| * | Simplified IsInTransit property on ScenePresence and removed InTransit() ↵Dan Lake2011-10-062-17/+16
| | | | | | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit().
* | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmergeMelanie2011-10-121-3/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
generated by cgit v1.1 at 2024-12-30 09:02:32 +0000