aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-252-10/+18
|\
| * Allow the user to enter help topics in upper or lowercase.Justin Clark-Casey (justincc)2012-03-241-10/+12
| * Give feedback when "terrain save-tile" is not successfully invoked.Justin Clark-Casey (justincc)2012-03-241-0/+6
* | Merge branch 'master' into careminsterMelanie2012-03-224-51/+65
|\ \ | |/
| * Rework Diva's patch to simplify itMelanie2012-03-221-0/+1
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF...Melanie2012-03-221-2/+0
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu...Diva Canto2012-03-221-0/+2
| * Instead of loading default avatar animations in both SLUtil and AvatarAnimati...Justin Clark-Casey (justincc)2012-03-212-51/+2
| * If "debug scene updates true" then print out to log when a garbage collection...Justin Clark-Casey (justincc)2012-03-211-0/+62
* | Revert "Stop messing order of updates, destroing the defined order of the sel...Melanie2012-03-211-8/+3
* | Stop messing order of updates, destroing the defined order of the selected pr...UbitUmarov2012-03-211-3/+8
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-211-58/+92
|\ \
| * \ 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
* | | | add convex state to mesh key, so a change is detected.UbitUmarov2012-03-211-0/+8
|/ / /
* | | 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-183-11/+76
|\ \ | |/
| * minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)2012-03-161-1/+1
| * Add total scripts count to "show threads"Justin Clark-Casey (justincc)2012-03-161-2/+10
| * Improve threadpool reporting to "show threads" console command (also gets pri...Justin Clark-Casey (justincc)2012-03-162-7/+57
| * Add process working memory to "show stats" memory statistics.Justin Clark-Casey (justincc)2012-03-162-4/+11
* | added ObjectPhysicsProperties http event message to send viewer that data. F...UbitUmarov2012-03-151-0/+2
* | Merge branch 'master' into careminsterMelanie2012-03-142-2/+7
|\ \ | |/
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-122-2/+7
* | initial suport for ExtraPhysical parts parameters. Reading from llclientView ...UbitUmarov2012-03-132-1/+51
* | Refactor, move OjectChangeData into it's own file and renameMelanie2012-03-131-0/+80
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-112-1/+92
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-112-1/+92
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-101-1/+51
| | |\
| | | * Factor out common default animations code into SLUtil. LLClientView now make...Justin Clark-Casey (justincc)2012-03-091-1/+51
| | * | Serialize all web requests to a particular host:port pair; only applied to th...Mic Bowman2012-03-091-0/+41
| | |/
* | | BIG MESS. changed Iclient interface so only one event is used to inform scene...UbitUmarov2012-03-101-0/+3
|/ /
* | Merge branch 'master' into careminsterMelanie2012-03-083-33/+103
|\ \ | |/
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-083-33/+103
* | Merge branch 'master' into careminsterMelanie2012-03-033-94/+45
|\ \ | |/
| * Use a fully stubbed out MockConsole for unit tests rather than inheriting fro...Justin Clark-Casey (justincc)2012-03-011-22/+37
| * Flick master up to 0.7.4Justin Clark-Casey (justincc)2012-02-291-1/+1
| * Some clean up in WebUtil, remove unused ServiceRequest function.Mic Bowman2012-02-271-71/+7
* | Merge branch 'master' into careminsterMelanie2012-02-243-19/+57
|\ \ | |/
| * Take watchdog alarm calling back outside the m_threads lock.Justin Clark-Casey (justincc)2012-02-241-3/+16
| * Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ...Justin Clark-Casey (justincc)2012-02-242-2/+2
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-242-17/+42
* | 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-182-2/+40
|\ \ | |/