aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-071-0/+13
|\
| * Add "show object pos <start-coord> to <end-coord>" command to simulator console.Justin Clark-Casey (justincc)2012-10-051-0/+13
* | Merge branch 'master' into careminsterMelanie2012-09-161-0/+32
|\ \ | |/
| * Add levels 4 and 5 to "debug http" console command that will log a sample of ...Justin Clark-Casey (justincc)2012-09-111-0/+32
* | Merge branch 'master' into careminsterMelanie2012-08-181-0/+6
|\ \ | |/
| * adding a clip method to handle Vector3 objects to enable a minor amount of re...SignpostMarv2012-08-171-0/+6
* | Merge branch 'master' into careminsterMelanie2012-07-131-0/+1
|\ \ | |/
| * Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-131-0/+1
* | Merge branch 'master' into careminsterMelanie2012-07-121-2/+1
|\ \ | |/
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-111-2/+1
* | Merge branch 'master' into careminsterMelanie2012-03-211-58/+92
|\ \ | |/
| * Refix the fixed fix!Melanie2012-03-211-2037/+2037
| * Fixed borkness with previous merge.Diva Canto2012-03-201-16/+1
| * Line endingsDiva Canto2012-03-201-89/+89
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-61/+89
| |\
| * | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-201-1954/+1988
* | | Merge branch 'master' into careminsterMelanie2012-03-201-2/+15
|\ \ \ | | |/ | |/|
| * | Move frame loop entirely within Scene.Update() for better future performance ...Justin Clark-Casey (justincc)2012-03-201-2/+15
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-181-3/+60
|\ \ | |/
| * Improve threadpool reporting to "show threads" console command (also gets pri...Justin Clark-Casey (justincc)2012-03-161-1/+55
| * Add process working memory to "show stats" memory statistics.Justin Clark-Casey (justincc)2012-03-161-2/+5
* | Merge branch 'master' into careminsterMelanie2012-02-211-0/+30
|\ \ | |/
| * Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-211-0/+30
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+37
|\ \ | |/
| * On Windows automatically load the correct native ODE library depending on whe...Justin Clark-Casey (justincc)2012-02-181-1/+37
* | Merge branch 'master' into careminsterMelanie2012-02-101-2/+3
|\ \ | |/
| * Add line numbers to Util.PrintCallStack()Justin Clark-Casey (justincc)2012-02-101-2/+3
* | Merge branch 'master' into bigmergeMelanie2011-12-091-16/+29
|\ \ | |/
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-081-16/+29
* | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-251-3/+4
|\ \ | |/
| * Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-221-3/+4
* | Bring us up to date.Tom2011-09-141-2/+40
|\ \ | |/
| * In an object return message, send a null-terminated empty string in binary bu...Justin Clark-Casey (justincc)2011-09-131-2/+40
* | Resolve merge commits, stage 1Tom2011-09-041-6/+34
|\ \ | |/
| * If a FireAndForget thread terminates with an exception, then catch and log ra...Justin Clark-Casey (justincc)2011-08-311-1/+15
| * Add new FireAndForgetMethod.None.Justin Clark-Casey (justincc)2011-08-161-1/+10
| * For all Util.FireAndForget invocations, set thread to en_US before continuing...Justin Clark-Casey (justincc)2011-07-291-5/+10
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-8/+33
|\ \ | |/
| * When loading library asset set, only store an asset if it's different from an...Justin Clark-Casey (justincc)2011-07-081-3/+13
| * Fix interpretation of physics mesh proxies from mesh dataJustin Clark-Casey (justincc)2011-07-081-2/+17
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-0/+63
|\ \ | |/
| * More on HG Friends. Added Delete(string, string) across the board. Added secu...Diva Canto2011-05-221-2/+4
| * HG Friends working to some extent: friendships offered and accepted correctly...Diva Canto2011-05-191-0/+61
* | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-211-0/+17
|\ \ | |/
| * Requeue unacknowledged entity updates rather than resend then "as is".Dan Lake2011-04-191-0/+17
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-241-3/+10
|\ \ | |/
| * Parameterizes the view distance used to compute and manageMic Bowman2011-02-221-3/+10
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+10
|\ \ | |/
| * Put something in the ImprovedInstantMessage.BinaryBucket for llInstantMessage...Justin Clark-Casey (justincc)2011-02-041-0/+10
* | Revert my previous SHA1 commit in favour of a better implementationTom2011-01-261-3/+9