aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix merge artefactsMelanie2012-07-173-10/+4
* Merge branch 'master' into careminsterMelanie2012-07-167-83/+13
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-07-161-30/+13
| |\
| | * refactor: factor out common code in WebStatsModule.OnMakeRootAgent()Justin Clark-Casey (justincc)2012-07-161-8/+7
| | * In WebStatsModule.OnMakeRootAgent(), get region ID directly from SP.Scene.Reg...Justin Clark-Casey (justincc)2012-07-161-18/+2
| | * Stop warning about no session from ViewerStats if user teleports to another r...Justin Clark-Casey (justincc)2012-07-161-6/+6
| * | Revert "Fix script "Running" behavior"Melanie2012-07-166-53/+0
| |/
* | Merge branch 'avination' into careminsterMelanie2012-07-1614-207/+233
|\ \
| * | Allow setting linked avatar positions from within a prim not the one sat onMelanie2012-07-161-11/+18
| * | Remove instrumentation and fix the message delivery issueMelanie2012-07-151-24/+28
| * | Testing changes and instrumentationMelanie2012-07-151-3/+20
| * | Save packets received while the client is added and replay them later.Melanie2012-07-151-0/+34
| * | Reinstate older set rotation code for avatars since it works in all casesMelanie2012-07-151-22/+1
| * | Replace sit position and rotation code with older, working versionMelanie2012-07-151-26/+28
| * | Revert "Fix a sit rotation issue"Melanie2012-07-151-1/+1
| * | Fix a sit rotation issueMelanie2012-07-151-1/+1
| * | Revert "Experimentally handle UseCircuitCode synchrnonously"Melanie2012-07-151-2/+1
| * | Experimentally handle UseCircuitCode synchrnonouslyMelanie2012-07-151-1/+2
| * | Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
| * | Make https work in the poll service managerMelanie2012-07-151-2/+2
| * | Fix a double parenthesis typoMelanie2012-07-151-1/+1
| * | Set up https to work like http does in the poll handlerMelanie2012-07-151-3/+3
| * | Reinstate sleeping because less CPU is preferred over reporting accuracy.Melanie2012-07-141-1/+1
| * | In collisions report linksets root parts to parts, and not all parts.UbitUmarov2012-07-134-41/+45
| * | missed fix on vehicle reference frameUbitUmarov2012-07-131-2/+1
| * | fix bad vehicle reference frameUbitUmarov2012-07-131-1/+2
| * | Revert " lltargetomega efective spinrate now multiplied by gain ( need check )"Melanie2012-07-131-1/+0
| * | Use faster any contact point collision detection for Volumedetect, plusUbitUmarov2012-07-123-98/+41
| * | Revert "Add instrumentation to log finalizer being called. Suppressed for bac...Melanie2012-07-122-12/+6
| * | Revert "Place instrumentation in the proper place. This needs reverting, too!"Melanie2012-07-121-1/+1
| * | Add "gc collect" console command for debugging memleaksMelanie2012-07-121-0/+7
| * | Place instrumentation in the proper place. This needs reverting, too!Melanie2012-07-111-1/+1
| * | Add instrumentation to log finalizer being called. Suppressed for backupMelanie2012-07-112-6/+12
| * | Change order of operations on backup to ensure keyframe motions are backedMelanie2012-07-111-2/+6
| * | be paranoic (?)UbitUmarov2012-07-111-0/+6
| * | Replace a Multicast Delegate by a simple list of delegates in access GetUbitUmarov2012-07-111-5/+23
* | | Merge branch 'master' into careminsterMelanie2012-07-161-1/+14
|\ \ \ | | |/ | |/|
| * | sending more user-friendly messages to the script error window rather than th...SignpostMarv2012-07-161-1/+14
* | | Merge branch 'master' into careminsterMelanie2012-07-163-207/+275
|\ \ \ | |/ /
| * | update PrimMesher.cs to dll version r72 which fixes some path errors in slice...dahlia2012-07-131-143/+183
| * | acting on feedback from justinccSignpostMarv2012-07-141-6/+7
| * | acting on feedback from justinccSignpostMarv2012-07-141-39/+42
| * | added in some extra variables, it sometimes thinks it is on the same parcel :(SignpostMarv2012-07-141-5/+7
| * | adding workaround for silent failure if position is outside the bounds of a r...SignpostMarv2012-07-141-13/+41
| * | Implementation of llSetRegionPos(). Does not implement failure on object entr...SignpostMarv2012-07-143-4/+45
| * | When generating a Warp3D texture, set the detailTexture[i] variable on resize...Justin Clark-Casey (justincc)2012-07-141-7/+14
* | | Merge branch 'master' into careminsterMelanie2012-07-1327-204/+169
|\ \ \ | |/ /
| * | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578Justin Clark-Casey (justincc)2012-07-131-1/+0
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-1315-84/+67
| * | Don't cache regions data on the other unused LocalGridServiceConnector that t...Justin Clark-Casey (justincc)2012-07-134-22/+42