aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-142-18/+22
|\ \ | |/
| * Fix "show threads" to show threads now being managed by OpenSim.Framework.Wat...Justin Clark-Casey (justincc)2010-09-142-18/+22
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1316-187/+245
|\ \ | |/
| * MergedJohn Hurliman2010-09-1211-157/+181
| |\
| | * Formatting cleanup.Jeff Ames2010-09-129-155/+152
| | * Add copyright headers.Jeff Ames2010-09-122-2/+29
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-16/+0
| |/
| * Made it impossible to create a user with names containing spaces and prevente...randomhuman2010-09-102-2/+54
| * Remove parenthesis around the release flavour to get the version string back ...Justin Clark-Casey (justincc)2010-09-101-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-081-6/+4
| |\
| | * * Cache null account responses in the SimianUserAccountServiceConnector to av...John Hurliman2010-09-071-6/+4
| * | If a scene object part UUID is changed (only possible when not in a scene), t...Justin Clark-Casey (justincc)2010-09-071-5/+5
| |/
| * Fix build breakMelanie2010-09-051-4/+0
* | Revert "Workaround for mono bug #312968"Melanie Thielker2010-09-061-1/+0
* | Workaround for mono bug #312968Melanie Thielker2010-09-061-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-053-5/+56
|\ \ | |/
| * Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-053-73/+57
| * Make User Agent Service and Login Service separable.Diva Canto2010-09-041-1/+17
| * Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-032-0/+30