aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-063-5/+141
|\
| * Merge branch 'moap'Justin Clark-Casey (justincc)2010-08-062-3/+114
| |\
| | * Simplify serialized version string. Change element capitalization for consis...Justin Clark-Casey (justincc)2010-08-031-5/+10
| | * get rid of PrimitiveBaseShape.MediaRaw staging postJustin Clark-Casey (justincc)2010-08-031-6/+0
| | * remove duplicated serialization codeJustin Clark-Casey (justincc)2010-08-031-12/+26
| | * serialize media textures to inventory with a largely osd representation rathe...Justin Clark-Casey (justincc)2010-08-031-3/+87
| | * comment out further debug line in BaseHttpServerJustin Clark-Casey (justincc)2010-07-271-1/+1
| | * relocate serialization code from SQLiteRegionData to MoapModule using load an...Justin Clark-Casey (justincc)2010-07-261-0/+6
| | * implement llSetPrimMediaParams()Justin Clark-Casey (justincc)2010-07-261-0/+1
| | * start storing incoming MediaEntry on a new Media field on PrimitiveBaseShapeJustin Clark-Casey (justincc)2010-07-261-0/+7
| | * do a whole load of crappy hacking to get cubes to display google.comJustin Clark-Casey (justincc)2010-07-261-1/+1
| * | Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-041-2/+27
| |\ \
| | * | Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-301-2/+27
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-043-0/+323
|\ \ \ \ | |/ / /
| * | | Revert "remove long unused OpenSim/Framework/Configuration/* projects"Melanie2010-08-043-0/+323
* | | | don't mask current time reads (since we don't mask the corresponding subtract)Mike Rieker2010-08-031-3/+3
* | | | Drop the RestClient timeout from 15 minutes to 30 seconds. This does not addr...Tom2010-08-031-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-3115-1512/+88
|\ \ \ \ | |/ / /
| * | | Slight improvement on previous commit.Diva Canto2010-07-301-1/+13
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-07-3013-1509/+0
| |\ \ \
| | * | | remove long unused OpenSim/Framework/Configuration/* projectsJustin Clark-Casey (justincc)2010-07-303-323/+0
| | * | | Remove unused ILoginServiceToRegionsConnectorJustin Clark-Casey (justincc)2010-07-301-41/+0
| | * | | Remove unused LLFileTransferJustin Clark-Casey (justincc)2010-07-301-40/+0
| | * | | remove long superseded HGNetworkServersInfoJustin Clark-Casey (justincc)2010-07-301-107/+0
| | * | | remove unused FriendRegionInfoJustin Clark-Casey (justincc)2010-07-301-38/+0
| | * | | remove now unused GridConfig, MessageServerConfig, UserConfigJustin Clark-Casey (justincc)2010-07-304-583/+0
| | * | | remove unused ACL classJustin Clark-Casey (justincc)2010-07-302-377/+0
| * | | | Changed the way HG client verification is done: now transforming local and LA...Diva Canto2010-07-301-0/+72
| |/ / /
| * | | * Tweaked WebUtil.PostToService() to help debug an object disposed exceptionJohn Hurliman2010-07-291-3/+4
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-291-1/+1
|\ \ \ | |/ /
| * | Added ': ' to password prompt. Mantis #4851Diva Canto2010-07-221-1/+1
| * | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie2010-07-141-1/+0
| * | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-1/+1
| * | Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-111-0/+65
* | | Replace the screenful of code i deleted.Melanie Thielker2010-07-171-0/+19
* | | Make webloading more robust by addign retriesMelanie Thielker2010-07-171-26/+22
* | | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie Thielker2010-07-141-1/+0
* | | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-1/+1
* | | Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-111-0/+65
* | | Fix the synchronousrestformsrequester so it will successfully handle a respon...Tom Grimshaw2010-07-101-1/+1
* | | Fix an issue where the SynchronousRestObjectRequester will fail if a webserve...Tom Grimshaw2010-07-101-1/+1
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-081-2/+13
|\ \ \ | |/ /
| * | Handle a specific exception without spewing red ink.Melanie2010-07-081-2/+13
| * | Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-022-6/+7
| * | Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-021-21/+0
| |/
* | The majority of the Undo fix. There is still an issue with Rotation which i'...Tom Grimshaw2010-07-041-1/+8
* | Correct positioning of timeout modifier in the SynchronousRestObjectRequesterTom Grimshaw2010-07-041-1/+1
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom Grimshaw2010-07-032-26/+6
|\ \
| * | Clean up IMoneyModule and adjust the other modules to the changesMelanie Thielker2010-07-022-6/+7
| * | Remove GetEconomyData and the economy data structure (unused)Melanie Thielker2010-07-021-21/+0