| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2013-06-04 | 7 | -34/+83 |
|\ |
|
| * | New HttpServer_OpenSim.dll with increased limits on number of connections, re... | Diva Canto | 2013-06-04 | 1 | -0/+0 |
| * | Adding back the BasicProfileModule | BlueWall | 2013-05-31 | 1 | -2/+2 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2013-05-30 | 6 | -2/+58 |
| |\ |
|
| | * | UserProfiles | BlueWall | 2013-05-30 | 6 | -2/+58 |
| * | | BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini and | Robert Adams | 2013-05-30 | 1 | -32/+25 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2013-05-30 | 4 | -0/+0 |
|\ \
| |/ |
|
| * | BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs | Robert Adams | 2013-05-26 | 4 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-05-24 | 4 | -0/+0 |
|\ \
| |/ |
|
| * | BulletSim: update DLLs and SOs with version containing gImpact code. | Robert Adams | 2013-05-21 | 4 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-05-16 | 8 | -12012/+11955 |
|\ \
| |/ |
|
| * | Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686b | Latif Khalifa | 2013-05-16 | 7 | -11955/+11955 |
| * | Removed obsolete libopenmetaverse file | Latif Khalifa | 2013-05-16 | 1 | -57/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-05-11 | 2 | -0/+12 |
|\ \
| |/ |
|
| * | Application support: | BlueWall | 2013-05-09 | 2 | -0/+12 |
* | | Merge branch 'master' into careminster | Melanie | 2013-05-08 | 1 | -0/+3 |
|\ \
| |/ |
|
| * | Adds an event and a method so that handling of the CachedTexture | Mic Bowman | 2013-05-08 | 1 | -0/+3 |
* | | Merge branch 'master' into careminster | Melanie | 2013-05-08 | 2 | -2/+7 |
|\ \
| |/ |
|
| * | Delete "" entry for AvatarPicker cap. | Diva Canto | 2013-05-07 | 1 | -1/+0 |
| * | Added AvatarPickerSearch capability handler. | Diva Canto | 2013-05-07 | 2 | -1/+7 |
* | | Merge branch 'master' into careminster | Melanie | 2013-05-04 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | Make default config directory "." | BlueWall | 2013-05-01 | 2 | -2/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2013-05-01 | 2 | -25/+30 |
|\ \
| |/ |
|
| * | Add information about creating a PID file for robust to the Robust.ini and Ro... | Justin Clark-Casey (justincc) | 2013-05-01 | 2 | -25/+30 |
* | | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 5 | -0/+0 |
|\ \
| |/ |
|
| * | BulletSim: version of libBulletSim.so for 32 bit systems that doesn't | Robert Adams | 2013-04-24 | 1 | -0/+0 |
| * | BulletSim: update DLLs and SOs to they have no dependencies on newer | Robert Adams | 2013-04-24 | 4 | -0/+0 |
| * | revert CSJ2K.dll to version in use prior to commit d4fa2c69ed2895dcab76e0df1b... | dahlia | 2013-04-23 | 1 | -0/+0 |
* | | Merge branch 'master' into careminster | Melanie | 2013-04-22 | 2 | -9/+10 |
|\ \
| |/ |
|
| * | Clean up unused config and config comments. | Diva Canto | 2013-04-21 | 2 | -9/+10 |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 19 | -18164/+17817 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster | Melanie | 2013-04-21 | 12 | -18164/+17810 |
| |\ \
| | |/ |
|
| | * | Fix spelling | BlueWall | 2013-04-20 | 1 | -2/+2 |
| | * | update libomv to git master which adds support for MaterialID in TextureEntry | dahlia | 2013-04-17 | 11 | -15459/+16598 |
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-10 | 7 | -0/+7 |
| |\ \
| | |/ |
|
| | * | BulletSim: add Bullet HACD library invocation. Turned off by default as not | Robert Adams | 2013-04-09 | 4 | -0/+0 |
| | * | Add more notes to async_call_method relating to UnsafeQueueUserWorkItem | Justin Clark-Casey (justincc) | 2013-04-09 | 1 | -0/+5 |
| | * | BulletSim: Add dylib for BulletSim and add he who figured out building BulletSim | Robert Adams | 2013-04-08 | 1 | -0/+0 |
| | * | fixed bullet config for osx | Jon Cundill | 2013-04-08 | 1 | -0/+2 |
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 4 | -0/+0 |
|\ \ \
| |/ / |
|
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 4 | -0/+0 |
| |\ \
| | |/ |
|
| | * | BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD | Robert Adams | 2013-04-01 | 4 | -0/+0 |
* | | | Add the set object owner floater template | Melanie | 2013-04-22 | 1 | -0/+8 |
|/ / |
|
* | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster | Melanie | 2013-03-19 | 3 | -0/+121 |
|\ \
| |/ |
|
| * | *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a c... | teravus | 2013-03-16 | 3 | -0/+121 |
* | | Merge branch 'master' into careminster | Melanie | 2013-03-14 | 2 | -0/+0 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensim/var/git/opensim | teravus | 2013-03-14 | 2 | -0/+12 |
| |\ |
|
| * | | * Updates HttpServer again to re-add the code that closes the stream and conn... | teravus | 2013-03-14 | 2 | -0/+0 |
* | | | Merge branch 'master' into careminster | Melanie | 2013-03-13 | 2 | -0/+12 |
|\ \ \
| | |/
| |/| |
|
| * | | Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section... | Justin Clark-Casey (justincc) | 2013-03-12 | 2 | -0/+12 |
| |/ |
|