aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-071-4/+8
|\
| * add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for O...dahlia2012-05-071-4/+8
* | Merge branch 'avination' into careminsterMelanie2012-05-051-1/+24
|\ \
| * | Fix teleporting from older to newer regionsMelanie2012-05-041-1/+8
| * | Add the default animation to the child agent data updateMelanie2012-05-041-0/+11
| * | Clear permissions given to the object we stand up fromMelanie2012-05-031-1/+6
* | | Merge branch 'master' into careminsterMelanie2012-05-0511-119/+297
|\ \ \ | | |/ | |/|
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has c...Justin Clark-Casey (justincc)2012-05-051-3/+13
| * | Change LongCallTime on WebUtil to 3000, to match the time where request handl...Justin Clark-Casey (justincc)2012-05-041-1/+1
| * | minor: Tweak BaseHttpServer message to make it clear that this relates to slo...Justin Clark-Casey (justincc)2012-05-041-1/+1
| * | Extend 'slow' request logging to other server outbound requests (forms, rest,...Justin Clark-Casey (justincc)2012-05-041-79/+194
| * | Implement optional name and description on http stream handlers so that we ca...Justin Clark-Casey (justincc)2012-05-039-35/+88
* | | Merge branch 'master' into careminsterMelanie2012-04-291-2/+8
|\ \ \ | |/ /
| * | Add text about using double quotes to surround console command arguments cont...Justin Clark-Casey (justincc)2012-04-281-2/+8
| * | Revert "Log the full exception when errors occur in BaseHttpServer"Justin Clark-Casey (justincc)2012-04-271-19/+19
| * | Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-04-271-19/+19
* | | Merge branch 'master' into careminsterMelanie2012-04-273-245/+215
|\ \ \ | |/ /
| * | Refactored how asset/inventory types are associated with content types: gathe...Oren Hurvitz2012-04-262-228/+177
| * | Add request verb and url to error messages in WebUtil that lack this.Justin Clark-Casey (justincc)2012-04-261-17/+38
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-272-15/+37
|\ \ \ | | |/ | |/|
| * | revert last add commitUbitUmarov2012-04-261-2/+3
| * | add wearable type PHYSICSUbitUmarov2012-04-261-6/+13
| * | Help big boobies to dance (avatar visualParams). May not persist and need mor...UbitUmarov2012-04-261-10/+24
* | | 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