aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-258/+193
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-234-38/+9
|\
| * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-223-38/+7
| * Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-223-7/+38
| |\
| | * * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| | * Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-174-6/+146
| | |\
| | * | * more url / hg cleanupJonathan Freedman2010-10-112-4/+29
| | * | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-102-17/+21
| | |\ \
| | * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-051-1/+36
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-031-0/+11
| | |\ \ \ \
| | * | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-022-6/+12
| * | | | | | Allow OARs and IARs to save and load meshes.Justin Clark-Casey (justincc)2010-10-221-0/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-213-7/+38
|\ \ \ \ \ \
| * | | | | | * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| * | | | | | * more url / hg cleanupJonathan Freedman2010-10-202-4/+29
| * | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-202-6/+12
| |/ / / / /
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-181-6/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Adding osFunctions for light projectionBlueWall2010-10-171-5/+50
| * | | | | Add missing check for !_projectionEntryBlueWall2010-10-161-1/+1
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-164-4/+99
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| * | | | | * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-141-0/+14
| * | | | | Kill some magic numbers in the caps moduleMelanie2010-10-141-3/+3
| * | | | | * Partially complete stuff for Mesh support that Melanie wanted to see before...Teravus Ovares (Dan Olivares)2010-10-141-1/+2
| | |_|_|/ | |/| | |
* | | | | Add a setter to OldItemID so it can be deserializedMelanie2010-10-131-0/+3
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-092-17/+21
|\ \ \ \ \ | |/ / / /
| * | | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-10-091-4/+4
| * | | | Limit formatting of local console output to actual logging messages.Marck2010-10-091-13/+17
| | |_|/ | |/| |
* | | | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-081-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-1/+36
|\ \ \ \ | |/ / /
| * | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved client...Diva Canto2010-10-031-1/+36
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-0/+11
|\ \ \ | |/ /
| * | Port ExecutingDirectory from omfOS Util class.Melanie2010-10-031-0/+11
| |/
* | When clearing the addin registry, respect a custom pathMelanie2010-09-241-4/+13
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-09-211-5/+3
|\ \
| * | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-5/+3
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-218-19/+484
|\ \ \ | |/ / |/| / | |/
| * * Tweaked the LocationTests for maximum coverage.Teravus Ovares (Dan Olivares)2010-09-182-1/+60
| * * Covered the type converters in SLUtil with unit tests.Teravus Ovares (Dan Olivares)2010-09-181-1/+57
| * * More Mundane TestsTeravus Ovares (Dan Olivares)2010-09-172-0/+198
| * REST Console delivers responses with content type text/xml instead of text/pl...Marck2010-09-181-2/+2
| * Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurlimanJustin Clark-Casey (justincc)2010-09-181-2/+3
| * Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/T...Justin Clark-Casey (justincc)2010-09-181-0/+0
| * * Fixed and re-enabled CacheTestsTeravus Ovares (Dan Olivares)2010-09-173-15/+166
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-172-0/+242
|\ \ | |/
| * * Add a few more tests to help our meager code coverage %.Teravus Ovares (Dan Olivares)2010-09-172-0/+242
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-0/+188
|\ \ | |/
| * Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-0/+188
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-141-46/+0
|\ \ | |/
| * Remove long unused Region/Framework/ThreadTrackerJustin Clark-Casey (justincc)2010-09-141-46/+0