aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim i...John Hurliman2010-02-2232-5144/+382
|\
| * Merge branch 'master' into presence-refactorMelanie2010-02-2229-5138/+376
| |\
| | * Formatting cleanup.Jeff Ames2010-02-222-5/+5
| | * Formatting cleanup.Jeff Ames2010-02-202-74/+59
| | * Apply http://opensimulator.org/mantis/view.php?id=4495Justin Clark-Casey (justincc)2010-02-192-0/+8
| | * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-02-191-1/+1
| | * forestall bug reports about the Command error: System.EntryPointNotFoundExcep...Justin Clark-Casey (justincc)2010-02-193-8/+86
| | * minor: Make FlotsamAssetCache default loglevel 0 to match that given in bin/c...Justin Clark-Casey (justincc)2010-02-192-4/+4
| | * Change handling of the SYSTEMIP constant to be more sane.Melanie2010-02-181-0/+2
| | * remove old commented out switch statement in LLClientView since this has succ...Justin Clark-Casey (justincc)2010-02-171-4845/+2
| | * minor: fix error inserting field in log messageJustin Clark-Casey (justincc)2010-02-171-1/+1
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-1644-364/+1524
| | |\
| | | * Formatting cleanup.Jeff Ames2010-02-1518-181/+178
| | | * Fixes a bug in the previous patch.Revolution2010-02-151-18/+13
| | * | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst...Justin Clark-Casey (justincc)2010-02-162-11/+26
| * | | One more test running.Diva Canto2010-02-211-1/+1
| * | | Small bug fixes for making tests work.Diva Canto2010-02-212-4/+4
| * | | * Added SQlite connector for AvatarData. Tested -- works.Diva Canto2010-02-211-1/+1
* | | | * Adds CreatorID to asset metadata. This is just the plumbing to support Crea...John Hurliman2010-02-2217-32/+36
|/ / /
* | | * Added a sanity check for missing asset data in LLClientViewJohn Hurliman2010-02-201-0/+10
* | | Merge branch 'master' into presence-refactorMelanie2010-02-1545-525/+1494
|\ \ \ | | |/ | |/|
| * | Plug a small holeMelanie2010-02-141-0/+3
| * | Revolution is on the roll again! :)Revolution2010-02-1432-215/+1380
| |/
| * Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522Justin Clark-Casey (justincc)2010-02-128-50/+50
| * minor: remove completely commented out and unused classJustin Clark-Casey (justincc)2010-02-121-226/+0
| * Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-128-50/+70
* | Merge branch 'master' into presence-refactorMelanie2010-02-086-30/+133
|\ \ | |/
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-082-18/+18
| |\
| * | add some method doc to IDynamicTextureManagerJustin Clark-Casey (justincc)2010-02-081-2/+59
| * | refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in Scene.AddSceneObj...Justin Clark-Casey (justincc)2010-02-082-5/+12
| * | Add EventManager.OnIncomingSceneObject event which is triggered by an incomin...Justin Clark-Casey (justincc)2010-02-084-17/+58
| * | minor: log what kind of wearable cannot be foundJustin Clark-Casey (justincc)2010-02-052-5/+6
* | | Merge branch 'master' into presence-refactorMelanie2010-02-0831-887/+2188
|\ \ \ | | |/ | |/|
| * | endline fix 2Teravus Ovares (Dan Olivares)2010-02-061-6/+6
| * | Endline fixTeravus Ovares (Dan Olivares)2010-02-061-12/+12
| |/
| * Revert "Old OpenSim installations may have no AssetCaching setting in config-...Justin Clark-Casey (justincc)2010-02-051-3/+1
| * Old OpenSim installations may have no AssetCaching setting in config-include/...Justin Clark-Casey (justincc)2010-02-051-1/+3
| * refactor: chain two ScenePresence constructors together to eliminate common c...Justin Clark-Casey (justincc)2010-02-042-16/+14
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-043-17/+17
| |\
| | * Applying patch #4534 by Misterblue to fix ODE physics stickinessJohn Hurliman2010-02-041-0/+2
| | * Revert "change position of OnAttach event firing so that this also happens wh...Melanie2010-02-042-17/+15
| * | minor: one method docJustin Clark-Casey (justincc)2010-02-042-3/+8
| |/
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-031-3/+3
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-02-034-17/+57
| | |\
| | * | allow terrain collision events after regular collision checkradams12010-02-031-3/+3
| * | | minor: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-3/+1
| * | | minor: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-10/+8
| * | | minor: add a smidgen of EventManager docJustin Clark-Casey (justincc)2010-02-032-6/+6
| * | | For each delegate added to events in the EventManager, catch and log but do n...Justin Clark-Casey (justincc)2010-02-031-314/+1128
| * | | add an IsRoot property to sopJustin Clark-Casey (justincc)2010-02-032-1/+24