aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* change previus code, send a NoEvents response back to http server, evenUbitUmarov2014-07-241-3/+0
* let BlockingQueue timeout work as its suposed to and not wait for everUbitUmarov2014-07-241-3/+2
* request.DoHTTPGruntWork(..) is now identical to our version, so useUbitUmarov2014-07-231-40/+5
* Merge branch 'avination-current'Melanie Thielker2014-07-191-1/+6
|\
| * Merge branch 'avination-current' into ubitworkUbitUmarov2014-07-165-7/+29
| |\
| * \ Merge branch 'avination-current' into ubitworkUbitUmarov2013-06-082-319/+0
| |\ \
| * | | add indexes for new visual parameters shape_hover andUbitUmarov2013-06-071-1/+6
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2182-663/+4118
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into careminsterMelanie2014-01-285-24/+70
| |\ \ \
| | * \ \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-201-14/+7
| | |\ \ \
| | | * | | Stop exceptions being generated on agent connection if a telehub object has b...Justin Clark-Casey (justincc)2014-01-201-14/+7
| | * | | | Materials module: a) Store materials as assets; b) Finalized it (removed the ...Oren Hurvitz2014-01-202-7/+36
| | * | | | Fix casting error for float type INI file parameter parsing.Robert Adams2014-01-191-1/+1
| | * | | | minor: Add method doc to IImproveAssetCacheJustin Clark-Casey (justincc)2014-01-181-1/+25
| * | | | | Merge branch 'master' into careminsterMelanie2014-01-282-1/+90
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-111-1/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.Oren Hurvitz2014-01-111-1/+3
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-0/+87
| | |\ \ \ \ | | | |/ / /
| | | * | | Refactored: use a single function to apply an object's folded permissions to ...Oren Hurvitz2014-01-101-0/+19
| | | * | | Refactored setting permissions when rezzing items: use the same function when...Oren Hurvitz2014-01-101-0/+68
| | | * | | Add missing viewer param elements for butt and breast physics.Justin Clark-Casey (justincc)2013-12-191-1/+75
| * | | | | Intermediate commit. Sill errors.Melanie2014-01-055-37/+223
| |\ \ \ \ \ | | |/ / / /
| | * | | | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-0/+2
| | * | | | Add routines in Util.cs for conversion of region handles to regionRobert Adams2014-01-042-1/+47
| | * | | | Add serialization/deserialization of region size to RegionInfo, GridRegion, a...Robert Adams2013-12-282-37/+158
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-15/+15
| | |\ \ \ \ | | | |/ / /
| | | * | | ParseNotecardToList() returned data past end of notecard text (mantis #6881).Kevin Cozens2013-12-141-15/+15
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | After previous discussion, put eye-catcher 'SCRIPT READY' messages to console...Justin Clark-Casey (justincc)2013-12-141-2/+2
| | * | | | Add missing files *blush*Melanie2013-12-111-0/+157
| | * | | | Committing the Avination Scene Presence and related texture codeMelanie2013-12-115-98/+237
| | |/ / /
| * | | | Revert "Add support for user preferences (im via email)"Melanie2013-12-071-8/+0
| * | | | Merge branch 'master' into careminsterMelanie2013-12-071-0/+8
| |\ \ \ \ | | |/ / /
| | * | | Add support for user preferences (im via email)BlueWall2013-12-061-0/+8
| * | | | Merge branch 'master' into careminsterMelanie2013-11-238-10/+34
| |\ \ \ \ | | |/ / /
| | * | | rename private field ACD.ViewerInternal to m_viewerInternal in line with conv...Justin Clark-Casey (justincc)2013-11-191-5/+6
| | * | | Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has be...Justin Clark-Casey (justincc)2013-11-191-1/+1
| | * | | Normalize viewer version string to accomodate new style version reporting in ...Latif Khalifa2013-11-191-1/+24
| | * | | refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-157-9/+9
| * | | | Merge branch 'master' into careminsterMelanie2013-11-081-1/+0
| |\ \ \ \ | | |/ / /
| | * | | Remove legacy sqlite lines added internally by OpenSimulator to the [Startup]...Justin Clark-Casey (justincc)2013-10-281-1/+0
| * | | | Merge branch 'master' into careminsterMelanie2013-11-035-0/+904
| |\ \ \ \ | | |/ / /
| | * | | * Add a session concurrency option per key. Allows developer/config to speci...teravus2013-10-094-23/+102
| | * | | * Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes belo...teravus2013-10-071-1/+29
| | * | | * Refactorteravus2013-10-074-410/+213
| | * | | * Added a Basic DOS protection container/base object for the most common HTTP...teravus2013-10-074-0/+994
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-061-0/+1
| |\ \ \ \
| | * | | | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-051-0/+1
| * | | | | Merge branch 'master' into careminsterMelanie2013-10-0613-14/+77
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | * Add an initial complete frame timeout to the WebSocket processor to make it...teravus2013-10-041-2/+65