aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmergeMelanie2011-10-253-17/+39
|\
| * Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollectionJustin Clark-Casey (justincc)2011-10-123-17/+39
| |
* | Fix ground sit autopilotMelanie2011-10-252-9/+19
| |
* | Fake an AgentCircuitData if none is available rather than crashing outMelanie2011-10-241-2/+24
| |
* | Allow updating the movement animation while flying. This fixes falling,Melanie2011-10-211-20/+6
| | | | | | | | splatting and ground sit. Walking to a ground sit still doesn't work.
* | Fix up the animator and ScenePresence to like each other againMelanie2011-10-202-7/+24
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-121-0/+7
|\ \
| * | Make it possible to disable the HG linker. On non-HG systems it spits yellowMelanie2011-10-121-0/+7
| | | | | | | | | | | | spam, so it should not load unless HG is desired.
* | | Merge branch 'master' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Change default groups messaging module in hardcode to the empty string.Melanie2011-10-121-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 rebrokenMelanie2011-10-121-12/+6
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-123-1/+43
|\ \ | |/
| * Start recording object updates per second statistic (analogue of agent ↵Justin Clark-Casey (justincc)2011-10-113-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 bigmergeMelanie2011-10-121-0/+1
|\ \ | |/
| * meaningless change to goose pandaJustin Clark-Casey (justincc)2011-10-111-0/+1
| |
* | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmergeMelanie2011-10-122-21/+32
|\ \ | |/
| * osSetParcelDetails - PARCEL_DETAILS_CLAIMDATEPixel Tomsen2011-10-112-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 bigmergeMelanie2011-10-121-0/+3
|\ \ | |/
| * Allow monitoring of stats by region nameJustin Clark-Casey (justincc)2011-10-101-0/+3
| |
* | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmergeMelanie2011-10-1216-21/+326
|\ \ | |/
| * Add other region stats (total frame time, physics fps, etc.) currently ↵Justin Clark-Casey (justincc)2011-10-1016-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 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-121-15/+35
|\ \ | |/
| * Provide a way to turn the MonitorModule on and offJustin Clark-Casey (justincc)2011-10-101-15/+35
| | | | | | | | 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-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
|\ \ | |/