| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 1 | -1/+3 |
|\ |
|
| * | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 1 | -1/+0 |
| * | touch prebuild.xml | UbitUmarov | 2012-09-24 | 1 | -0/+1 |
| * | Change the poll service to use a thread pool for replies to make sure the | Melanie | 2012-09-23 | 1 | -0/+1 |
| * | fix build | UbitUmarov | 2012-09-17 | 1 | -2/+2 |
| * | add suport funtions for mesh upload costs | UbitUmarov | 2012-09-17 | 1 | -0/+1 |
* | | Merge branch 'avination' into careminster | Melanie | 2012-09-16 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | fix prebuild.xml | UbitUmarov | 2012-09-11 | 1 | -1/+1 |
| * | Revamp the v3 inventory sending. Uses threads and some nifty mechanics to | Melanie | 2012-09-11 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -0/+1 |
|\ \ |
|
| * | | Add basic asset connector tests to check behaviour for normal, local and temp... | Justin Clark-Casey (justincc) | 2012-09-15 | 1 | -0/+1 |
| * | | Revert "Fix prebuild.xml format for reference" | BlueWall | 2012-09-11 | 1 | -1/+1 |
| * | | Fix prebuild.xml format for reference | BlueWall | 2012-09-11 | 1 | -1/+1 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-02 | 1 | -0/+1 |
|\ \ \
| |/ / |
|
| * | | Fix Windows build | BlueWall | 2012-08-31 | 1 | -0/+1 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -1/+41 |
|\ \ \
| |/ / |
|
| * | | Renaming existing 'torture' tests to 'performance' tests instead, since this ... | Justin Clark-Casey (justincc) | 2012-08-29 | 1 | -1/+1 |
| * | | Add VectorRenderModuleStressTests that contains a long running test that gene... | Justin Clark-Casey (justincc) | 2012-08-29 | 1 | -0/+40 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 1 | -0/+1 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | Add --force flag to "kick user" console command to allow bypassing of recent ... | Justin Clark-Casey (justincc) | 2012-08-20 | 1 | -0/+1 |
* | | *** TESTTTTT ** downgrade from .net 4.0 to .net3.5 | UbitUmarov | 2012-08-06 | 1 | -97/+97 |
* | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Add simple draw test for the VectorRenderModule | Justin Clark-Casey (justincc) | 2012-08-02 | 1 | -1/+1 |
* | | Fix some merge issues and a functional issue in the scene manager | Melanie | 2012-07-28 | 1 | -39/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 1 | -23/+63 |
|\ \
| |/ |
|
| * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring wi... | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -26/+29 |
| * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -24/+23 |
| * | Add experimental "OpenSim object memory churn" statistics to output of region... | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -0/+1 |
* | | Fix merge issues in prebuild | Melanie | 2012-07-23 | 1 | -33/+33 |
* | | Merge branch 'master' into careminster | Melanie | 2012-07-23 | 1 | -0/+25 |
|\ \
| |/ |
|
| * | Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled b... | Robert Adams | 2012-07-20 | 1 | -58/+58 |
| * | Remove an added but unnecessary dependency in prebuild.xml | Robert Adams | 2012-07-20 | 1 | -1/+0 |
| * | Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a simpl... | Robert Adams | 2012-07-20 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Fix build break for windows with missing package for IScriptEngine in prebuil... | Justin Clark-Casey (justincc) | 2012-07-11 | 1 | -0/+1 |
| * | Add regression TestDetachScriptedAttachmentToInventory() | Justin Clark-Casey (justincc) | 2012-07-11 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ava... | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Make the "debug http" command available for robust as well as the simulator. ... | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-06-07 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Mantis 6044 Building master currently fails. | Talun | 2012-06-07 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Fix prebuild.xml | BlueWall | 2012-04-27 | 1 | -1/+1 |
| * | Use DotNetZip to compress OARs and IARs. | Oren Hurvitz | 2012-04-27 | 1 | -0/+1 |
* | | Fx up estate settings | Melanie | 2012-04-18 | 1 | -96/+96 |
* | | Merge branch 'master' into careminster | Melanie | 2012-04-03 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Eliminate race condition where many callers would check SOP.PhysicsActor != n... | Justin Clark-Casey (justincc) | 2012-04-03 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 1 | -0/+3 |
|\ \
| |/ |
|
| * | Added missing dependency for MS 2008. I hope. (I don't have 2008 to test this... | Diva Canto | 2012-03-30 | 1 | -0/+1 |