aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmergeMelanie2011-10-253-9/+1
|\
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-10-123-44/+1
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-255-54/+6
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-125-54/+6
* | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmergeMelanie2011-10-256-354/+291
|\ \ | |/
| * Bring LindenUDP.Tests back from the dead. No tests are running.Justin Clark-Casey (justincc)2011-10-126-354/+291
* | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmergeMelanie2011-10-252-2/+2
|\ \ | |/
| * When shutting down XEngine, log how many scripts are being shutdown so the us...Justin Clark-Casey (justincc)2011-10-122-2/+5
* | Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmergeMelanie2011-10-253-3/+12
|\ \ | |/
| * minor: insert some commented out log lines which are a blunt but useful instr...Justin Clark-Casey (justincc)2011-10-123-3/+12
* | Merge commit '36e73dbc9b7fb46885865f5537c43a29239fd559' into bigmergeMelanie2011-10-250-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-126-2/+12
| |\
* | \ 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
* | | Fix up the animator and ScenePresence to like each other againMelanie2011-10-202-7/+24
* | | Merge branch 'master' into bigmergeMelanie2011-10-124-0/+10
|\ \ \ | | |/ | |/|
| * | Make it possible to disable the HG linker. On non-HG systems it spits yellowMelanie2011-10-124-0/+10
* | | Disable Flotsam groups messaging module in our config baseMelanie2011-10-121-1/+1
* | | Merge branch 'master' into bigmergeMelanie2011-10-122-2/+2
|\ \ \ | |/ /
| * | Update OpenSimDefaults.ini to make the prior state (Groups messaging enabledMelanie2011-10-121-1/+1
| * | Change default groups messaging module in hardcode to the empty string.Melanie2011-10-121-1/+1
| |/
* | 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 update...Justin Clark-Casey (justincc)2011-10-113-1/+43
* | 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
* | 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-122-15/+40
|\ \ | |/
| * Provide a way to turn the MonitorModule on and offJustin Clark-Casey (justincc)2011-10-102-15/+40
* | 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-122-5/+6
|\ \ | |/