aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-304-64/+78
|\
| * BulletSim: default physical terrain implementation to heightmap.Robert Adams2014-01-292-1/+9
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2014-01-281-17/+17
| |\
| | * Restore brush tests with correct values and adjustments for new terrain heightRobert Adams2014-01-281-17/+17
| * | One more run at fixing the sun module. Parameter setting fixed toMic Bowman2014-01-281-52/+52
| |/
| * Temporarily disable brush test. It will come back when tuning is complete.Robert Adams2014-01-281-0/+2
| * Change area of brush test to account for rounding errors in terrain implement...Robert Adams2014-01-281-2/+2
| * Increase the strength of brushes in brush test in an attempt to overcome roun...Robert Adams2014-01-281-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2014-01-282-2/+6
| |\
| * | Actually make the parameter updates change the behavior ofMic Bowman2014-01-281-0/+4
* | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-301-0/+33
|\ \ \ | |_|/ |/| |
| * | Add "show grid user" robust/standalone console command for debug purposes.Justin Clark-Casey (justincc)2014-01-301-0/+33
* | | clear land tainting when tested. Then testing, pass scene to LandObject as no...Robert Adams2014-01-282-2/+6
| |/ |/|
* | Fix terrain tests by properly initializing low detail terrain to zero height.Robert Adams2014-01-283-5/+5
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2014-01-285-4/+21
|\ \
| * | Repair database routines so they properly return null when asked forRobert Adams2014-01-285-4/+21
* | | Some major surgery on the sun module. Updates to the client were gatedMic Bowman2014-01-281-51/+46
|/ /
* | Merge branch 'master' into varregionRobert Adams2014-01-286-43/+107
|\ \
| * \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-284-24/+75
| |\ \ | | |/
| | * Added osGetRegionSize(), which returns the region size in meters and recogniz...Oren Hurvitz2014-01-283-0/+29
| | * Convert tabs to spaces from previous commit 8c2b41b01Justin Clark-Casey (justincc)2014-01-281-27/+27
| | * Make inidirectory files supercede distro filesDev Random2014-01-271-27/+49
| * | Reinsert attachments list taking code in SP.MakeRootAgent()Justin Clark-Casey (justincc)2014-01-271-14/+30
| * | refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occu...Justin Clark-Casey (justincc)2014-01-271-2/+1
| * | Re-enabled NPCModuleTests.TestCreate()Justin Clark-Casey (justincc)2014-01-271-3/+1
* | | varregion: fix for teleporting by double clicking on a map location.Robert Adams2014-01-281-0/+13
* | | varregion: enable teleporting to a varregion by clicking on the map andRobert Adams2014-01-266-83/+221
* | | Merge branch 'master' into varregionRobert Adams2014-01-265-109/+136
|\ \ \ | |/ /
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-241-21/+19
| |\ \ | | |/
| | * minor: remove long unused state queue from "show queues" console reportsJustin Clark-Casey (justincc)2014-01-241-5/+3
| | * minor: correct the usage statement on the "show image queues" console command...Justin Clark-Casey (justincc)2014-01-241-1/+1
| | * Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) fro...Justin Clark-Casey (justincc)2014-01-241-15/+15
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-244-320/+362
| |\ \ | | |/
| | * Properly dispose of drawing objects to reduce/stop memory leakage on generati...Justin Clark-Casey (justincc)2014-01-244-319/+343
| | * Add "generate map" console command to allow manual regeneration and storage o...Justin Clark-Casey (justincc)2014-01-232-1/+19
* | | varregion: modify MapImageModule structure so it will better mergeRobert Adams2014-01-261-263/+271
* | | varregion: pass region size in more HG services.Robert Adams2014-01-243-1/+17
* | | Enable the simulator to handle region size information returned fromMic Bowman2014-01-231-0/+12
* | | Merge branch 'master' into varregionRobert Adams2014-01-2125-761/+1195
|\ \ \ | |/ /
| * | Adds a configuration option to cannibalize bandwidth from theMic Bowman2014-01-202-0/+20
| * | Add back code to UuidGatherer to retrieve UUIDs for materials stored in DynAt...dahlia2014-01-201-0/+73
| * | rather than converting existing materials to assets, just retrieve them and m...dahlia2014-01-201-32/+12
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2014-01-2011-43/+467
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-204-3/+281
| | |\ \
| | | * | Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-204-3/+281
| | * | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-207-40/+186
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Stop exceptions being generated on agent connection if a telehub object has b...Justin Clark-Casey (justincc)2014-01-207-40/+186
| * | | add null texture entry face check before converting legacy materialsdahlia2014-01-201-2/+2
| |/ /
| * | force SOG update when converting legacy materials to ensure changes are persi...dahlia2014-01-201-0/+2
| * | delay texture entry parsing until absolutely necessary while converting legac...dahlia2014-01-201-4/+4