aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2014-02-0422-336/+522
|\ \
| * | Add "--no-objects" parameter to 'load oar'.Robert Adams2014-02-023-1/+9
| * | Really add the old parameter names to load oar to keep downward compatibiliyRobert Adams2014-02-021-0/+2
| * | Change new 'load oar' parameters to be hyphenated to be consistant withRobert Adams2014-02-023-18/+18
| * | Implement terrain merging in TerrainChannel.Robert Adams2014-02-026-54/+129
| * | Overload INPCModule.CreateNPC() to allow agentID to be specified. Note: this ...dahlia2014-02-013-3/+64
| * | In UuidGatherer, gather materials referenced in the prim's TextureEntryOren Hurvitz2014-02-011-2/+15
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-315-146/+165
| |\ \ | | |/
| | * Make sure Web streams are disposed after useOren Hurvitz2014-01-314-48/+40
| | * Made error messages more consistentDavid Rowe2014-01-311-15/+15
| | * Replaced throwing exceptions with calls to Error()David Rowe2014-01-311-7/+9
| | * Replaced llSay()ing LSL errors with calls Error()David Rowe2014-01-311-9/+8
| | * Replaced LSLError() calls with calls to Error()David Rowe2014-01-311-15/+10
| | * Updated "deprecated" LSL errors to use Deprecrated()David Rowe2014-01-311-19/+11
| | * Updated "not implemented" LSL errors to use NotImplemented()David Rowe2014-01-311-4/+3
| | * Updated ShoutError() calls to use new LSL error methodsDavid Rowe2014-01-311-38/+27
| | * Updated methods for handling LSL script errors, deprecated, and not implementedDavid Rowe2014-01-311-7/+58
| * | 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-281-1/+1
| |\ \
| | * | clear land tainting when tested. Then testing, pass scene to LandObject as no...Robert Adams2014-01-281-1/+1
| * | | Actually make the parameter updates change the behavior ofMic Bowman2014-01-281-0/+4
| |/ /
| * | Fix terrain tests by properly initializing low detail terrain to zero height.Robert Adams2014-01-282-5/+4
| * | Some major surgery on the sun module. Updates to the client were gatedMic Bowman2014-01-281-51/+46
* | | Dropping the rest of Avination's modified appearance code for core.Melanie2014-02-042-46/+339
|/ /
* | 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-263-82/+168
* | | 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
* | | Merge branch 'master' into varregionRobert Adams2014-01-2120-733/+1133
|\ \ \ | |/ /