aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmergeMelanie2011-10-122-21/+32
|\ \ | |/
| * osSetParcelDetails - PARCEL_DETAILS_CLAIMDATEPixel Tomsen2011-10-112-21/+32
* | 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 missin...Justin Clark-Casey (justincc)2011-10-1016-21/+326
* | Merge commit '19096bd391ac88bbccda00e4660a061020118bb9' into bigmergeMelanie2011-10-123-15/+15
|\ \ | |/
| * Convert getLastReportedSimFPS() and getLastReportedSimStats() into more idiom...Justin Clark-Casey (justincc)2011-10-103-15/+15
* | 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
* | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmergeMelanie2011-10-123-15/+2
|\ \ | |/
| * refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t...Justin Clark-Casey (justincc)2011-10-103-15/+2
* | 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 GridService.Regist...Justin Clark-Casey (justincc)2011-10-081-2/+4
* | Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmergeMelanie2011-10-121-0/+2
|\ \ | |/
| * GridService - Region UUID can not be NULLPixel Tomsen2011-10-081-0/+2
* | Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmergeMelanie2011-10-121-39/+1
|\ \ | |/
| * Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() c...Justin Clark-Casey (justincc)2011-10-081-39/+1
* | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmergeMelanie2011-10-121-5/+5
|\ \ | |/
| * replace List used by m_accessIP in RemoteAdminPlugin with the more efficient ...Justin Clark-Casey (justincc)2011-10-081-5/+4
* | 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
* | 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 of...Justin Clark-Casey (justincc)2011-10-081-2/+6
* | 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
* | | Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log messageJustin Clark-Casey (justincc)2011-10-071-1/+1
| |/
* | 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
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-123-13/+6
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ret...Justin Clark-Casey (justincc)2011-10-073-13/+6
| |/
| * 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
* | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-122-17/+16
|\ \ \ | | |/ | |/|
| * | Simplified IsInTransit property on ScenePresence and removed InTransit() whic...Dan Lake2011-10-062-17/+16
* | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmergeMelanie2011-10-121-3/+0
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-068-109/+87
| |\ \
* | | | 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
|\ \ \ \ | |/ / /
generated by cgit v1.1 at 2024-12-30 12:27:10 +0000