aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | Add line numbers to Util.PrintCallStack()Justin Clark-Casey (justincc)2012-02-101-2/+3
| |/
* | Change parser to leave embedded quotes alone if the pattern is recognizedMelanie2012-02-101-0/+34
* | Merge branch 'master' into careminsterMelanie2012-02-051-2/+2
|\ \ | |/
| * Set PhysPrimMax default to 0 so ini files won't be overriddenBlueWall2012-02-041-1/+1
| * Make NonphysicalPrimMax setting work properlyBlueWall2012-02-041-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-049-111/+370
|\ \ | |/
| * Add TestRegionSettingsDeserializeJustin Clark-Casey (justincc)2012-02-042-1/+135
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-033-4/+12
| |\
| | * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-048-109/+215
| | |\
| | | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-032-2/+10
| | | |\
| | | | * Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i...PixelTomsen2012-02-032-2/+10
| | * | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ...Snoopy Pfeffer2012-02-031-2/+2
| | | |/ | | |/|
| * | | Change SceneObjectSerializer to use common ExternalRepresentationUtils.Execut...Justin Clark-Casey (justincc)2012-02-031-9/+28
| | |/ | |/|
| * | Refactor common deserialization processor code to generic method ExternalRepr...Justin Clark-Casey (justincc)2012-02-033-98/+62
| * | Change LandDataSerializer deserialization so that in the future it won't care...Justin Clark-Casey (justincc)2012-02-035-75/+209
| |/
* | Merge branch 'master' into careminsterMelanie2012-02-031-18/+23
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-026-21/+42
| |\
| * | fix line endingsDan Lake2012-02-021-7/+7
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-019-167/+251
| |\ \
| * | | Fixed bugs in earlier commit on custom user parameters in Regions.iniDan Lake2012-01-191-20/+25
* | | | Merge branch 'master' into careminsterMelanie2012-02-031-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix test failureMelanie2012-02-031-0/+1
| * | | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-025-21/+30
* | | | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-025-21/+30
* | | | Merge branch 'master' into careminsterMelanie2012-02-021-3/+3
|\ \ \ \ | |/ / /
| * | | Improve reliability of script state saving by covering various savingMelanie2012-02-021-0/+11
| | |/ | |/|
* | | Improve reliability of script state saving by covering various savingMelanie2012-02-021-2/+12
* | | Merge branch 'master' into careminsterMelanie2012-01-311-1/+1
|\ \ \ | |/ /
| * | Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCo...Justin Clark-Casey (justincc)2012-01-311-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-01-301-0/+8
|\ \ \ | |/ /
| * | Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-301-0/+8
* | | Merge branch 'master' into careminsterMelanie2012-01-281-2/+2
|\ \ \ | |/ /
| * | Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-281-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-01-261-0/+6
|\ \ \ | |/ /
| * | llManageEstateAccess implementation http://wiki.secondlife.com/wiki/LlManageE...PixelTomsen2012-01-261-0/+6
* | | Merge branch 'master' into careminsterMelanie2012-01-261-0/+6
|\ \ \ | |/ /
| * | llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParce...Pixel Tomsen2012-01-251-0/+6
* | | Merge branch 'master' into careminsterMelanie2012-01-251-123/+125
|\ \ \ | |/ /
| * | Comment out asset statistics section from periodic stats as these have not be...Justin Clark-Casey (justincc)2012-01-241-108/+109
| * | Comment out inventory statistics section from periodic stats, since this only...Justin Clark-Casey (justincc)2012-01-241-14/+15
| * | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-241-1/+1
| * | Reverse the spawn point distance vectorMelanie2012-01-241-3/+3
| * | Correct a coordinate to make the viewer like itMelanie2012-01-241-2/+2
* | | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-241-1/+1
* | | Reverse the spawn point distance vectorMelanie2012-01-241-3/+3
* | | Correct a coordinate to make the viewer like itMelanie2012-01-241-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-01-241-63/+45
|\ \ \ | |/ /
| * | Change Telehubs to store only the data that is really needed and notMelanie2012-01-241-71/+45
* | | Merge branch 'master' into careminsterMelanie2012-01-231-44/+6
|\ \ \ | |/ /
| * | Finish connecting Telehub to databaseBlueWall2012-01-221-44/+6