aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-121-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-081-5/+4
| | | | | | | | HashSet
* | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmergeMelanie2011-10-121-124/+116
|\ \ | |/
| * Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.Justin Clark-Casey (justincc)2011-10-081-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 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 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 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 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
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-068-109/+87
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | | | HACK: Remove advanced property resending until it is fixed properly in core.Melanie2011-10-121-10/+14
| | | |
* | | | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmergeMelanie2011-10-122-265/+266
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Refactor ScenePresence so gets and sets are through properties. Added ↵Dan Lake2011-10-061-287/+288
| | | | | | | | | | | | | | | | private sets when needed. Removed redundant code when methods replicated what the set already does
* | | | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmergeMelanie2011-10-121-0/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Added back UserAccount that creates random UUID for new account.BlueWall2011-10-051-0/+11
| | |/ | |/| | | | | | | | | | This should fix recent issues with 3rd party apps that use the old interface w/o breaking the new one.
* | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmergeMelanie2011-10-124-36/+21
|\ \ \ | |/ /
| * | Instead of adding stat agentMS in all kinds of places, calculate it instead ↵Justin Clark-Casey (justincc)2011-10-064-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 '7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7' into bigmergeMelanie2011-10-121-11/+11
|\ \ \ | |/ /
| * | rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not ↵Justin Clark-Casey (justincc)2011-10-051-11/+11
| | | | | | | | | | | | a single one
* | | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Add user ID to new estate user prompt, to make it clearer and consistent ↵Justin Clark-Casey (justincc)2011-10-051-1/+1
| | | | | | | | | | | | with the main create user prompts
* | | Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmergeMelanie2011-10-121-34/+7
|\ \ \ | |/ /
| * | Change WebStatsModule to check its config properly, instead of catching the ↵Justin Clark-Casey (justincc)2011-10-051-34/+7
| | | | | | | | | | | | | | | | | | ineviable NullReferenceException! Also, tidy up spacing.
* | | Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmergeMelanie2011-10-121-3/+0
|\ \ \ | |/ /
| * | Remove unused local variable i from OdeScene.Simulate()Justin Clark-Casey (justincc)2011-10-051-3/+0
| | |
* | | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmergeMelanie2011-10-123-24/+36
|\ \ \ | |/ /
| * | Make reported sim fps more accurate, in line with frame time msJustin Clark-Casey (justincc)2011-10-053-24/+36
| |/ | | | | | | Also remove some unused fields and improve naming on others.
* | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmergeMelanie2011-10-121-21/+4
|\ \ | |/
| * Removed redundant scene presence lookups in HGMessageTransferModuleDan Lake2011-10-051-21/+4
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-044-9/+29
| |\
generated by cgit v1.1 at 2024-12-24 16:27:46 +0000