aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-251-0/+4
|\
| * Revert "Refactored how asset/inventory types are associated with content type...Justin Clark-Casey (justincc)2012-04-242-177/+228
| * Minor improvements to loggingOren Hurvitz2012-04-241-0/+4
| * Refactored how asset/inventory types are associated with content types: gathe...Oren Hurvitz2012-04-242-228/+177
* | Merge branch 'master' into careminsterMelanie2012-04-231-0/+20
|\ \ | |/
| * Mantis 5977 Corrections to llRegionSayToTalun2012-04-231-0/+20
* | Merge branch 'master' into careminsterMelanie2012-04-201-2/+2
|\ \ | |/
| * Add more exception detail to Exception and IOException throws in BaseHttpServ...Justin Clark-Casey (justincc)2012-04-201-2/+2
* | Fx up estate settingsMelanie2012-04-181-1/+1
* | Merge branch 'master' into careminsterMelanie2012-04-172-4/+4
|\ \ | |/
| * refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateM...Justin Clark-Casey (justincc)2012-04-172-4/+4
* | Merge branch 'master' into careminsterMelanie2012-04-071-2/+2
|\ \ | |/
| * Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
* | Merge branch 'master' into careminsterMelanie2012-03-313-17/+5
|\ \ | |/
| * Add Extended flavour option to opensim version information.Justin Clark-Casey (justincc)2012-03-301-1/+2
| * refactor: Stop passing both IClientAPI and agentID to friend event listeners,...Justin Clark-Casey (justincc)2012-03-291-3/+3
| * Add back parts of reverted changes that were not concerned with child agent c...Justin Clark-Casey (justincc)2012-03-291-1/+1
| * Change namespace on CallingCardModule and correct interface file placemant. A...Melanie2012-03-291-13/+0
| * Revert "Simplify friends caching by only doing this for root agents - no func...Justin Clark-Casey (justincc)2012-03-291-1/+1
| * Adding the Avination calling card interfaceMelanie2012-03-291-0/+13
* | Merge branch 'master' into careminsterMelanie2012-03-292-2/+2
|\ \ | |/
| * Simplify friends caching by only doing this for root agents - no functions re...Justin Clark-Casey (justincc)2012-03-281-1/+1
| * Enable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoic...Justin Clark-Casey (justincc)2012-03-281-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-281-0/+2
|\ \ | |/
| * Start on Bulk inventory update via CAPS. Not functional yet. HG v2Melanie2012-03-281-0/+2
* | Merge branch 'master' into careminsterMelanie2012-03-281-0/+1
|\ \ | |/
| * Add a corresponding method for items. HG v2Melanie2012-03-281-0/+1
| * Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-0/+37
* | Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-0/+37
* | Merge branch 'master' into careminsterMelanie2012-03-252-10/+18
|\ \ | |/
| * Allow the user to enter help topics in upper or lowercase.Justin Clark-Casey (justincc)2012-03-241-10/+12
| * Give feedback when "terrain save-tile" is not successfully invoked.Justin Clark-Casey (justincc)2012-03-241-0/+6
* | Merge branch 'master' into careminsterMelanie2012-03-224-51/+65
|\ \ | |/
| * Rework Diva's patch to simplify itMelanie2012-03-221-0/+1
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF...Melanie2012-03-221-2/+0
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu...Diva Canto2012-03-221-0/+2
| * Instead of loading default avatar animations in both SLUtil and AvatarAnimati...Justin Clark-Casey (justincc)2012-03-212-51/+2
| * If "debug scene updates true" then print out to log when a garbage collection...Justin Clark-Casey (justincc)2012-03-211-0/+62
* | Revert "Stop messing order of updates, destroing the defined order of the sel...Melanie2012-03-211-8/+3
* | Stop messing order of updates, destroing the defined order of the selected pr...UbitUmarov2012-03-211-3/+8
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-211-58/+92
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-211-58/+92
| |\ \ | | |/
| | * Refix the fixed fix!Melanie2012-03-211-2037/+2037
| | * Fixed borkness with previous merge.Diva Canto2012-03-201-16/+1
| | * Line endingsDiva Canto2012-03-201-89/+89
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-61/+89
| | |\
| | * | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-201-1954/+1988
* | | | add convex state to mesh key, so a change is detected.UbitUmarov2012-03-211-0/+8
|/ / /
* | | Merge branch 'master' into careminsterMelanie2012-03-201-2/+15
|\ \ \ | | |/ | |/|
| * | Move frame loop entirely within Scene.Update() for better future performance ...Justin Clark-Casey (justincc)2012-03-201-2/+15
| |/