aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix playing sound from HUDsMelanie2010-11-031-8/+0
* Merge branch 'master' into careminster-presence-refactorMelanie2010-11-032-0/+2
|\
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-032-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+9
|\ \ | |/
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-4/+1
|\ \ | |/
| * Fix avatar height managementMelanie2010-11-021-24/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-51/+67
|\ \ | |/
| * Fix sitting and standing upMelanie2010-11-021-5/+14
| * Old deserialization can't deal with commas in flag fields. Making use of -ver...Diva Canto2010-11-021-3/+17
| * Move physics actor creation to after SetHeight to try and preventMelanie2010-10-301-11/+11
| * tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
| * Rationalize the logging messages from the merged appearance branch, commentin...Justin Clark-Casey (justincc)2010-10-291-5/+5
| * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-291-3/+9
| |\
| | * add timing report to CompleteScenePresence for diagnostic purposesJustin Clark-Casey (justincc)2010-10-291-1/+8
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-293-23/+96
|\ \ \ | |/ /
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-293-23/+96
| |\ \
| | * | Clean up some cruft from the last commit. Re-add the initial updateMaster ScienceSim2010-10-292-2/+41
| | * | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-292-20/+53
| | * | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-285-25/+88
| | |\ \ | | | |/
| | * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-4/+5
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-293-168/+48
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-293-159/+48
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-213-160/+50
| | |\ \ | | | |/
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-203-159/+49
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-274-14/+35
|\ \ \ \ | |/ / /
| * | | Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
| * | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-262-4/+4
| |\ \ \
| | * | | Formatting cleanup.Jeff Ames2010-10-272-4/+4
| * | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif...dahlia2010-10-261-9/+27
| |/ / /
* | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-251-16/+22
|\ \ \ \
| * | | | Comment repeated add and remove of avatars from the physical scene. It's noMelanie2010-10-251-16/+22
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-251-3/+16
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Added inner exception handling in Shape deserialization processing, so that t...Diva Canto2010-10-231-3/+16
* | | | Change the results from llGetPrimitiveParams to be the same as SL forMelanie2010-10-241-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-232-2/+35
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-221-3/+3
| |\ \ \
| | * | | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-222-7/+2
| |/ / /
| * | | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-222-2/+7
| |\ \ \
| | * | | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-2/+5
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | | |/ | | |/|
| * | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-221-0/+35
| * | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-222-9/+3
| |/ /
* | | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-212-9/+3
|\ \ \ | | |/ | |/|
| * | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-212-8/+52
|\ \ \ | |/ /
| * | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| |/