aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge branch 'master' into careminsterMelanie2012-08-0418-113/+215
| | |\ \ | | | |/
| | | * Strip experimental tag from --publish option of "save oar" region console com...Justin Clark-Casey (justincc)2012-08-031-8/+7
| | | * Fix old regression that stopped saving parcel owner data in OARs.Justin Clark-Casey (justincc)2012-08-033-36/+73
| | | * Fix build break.Justin Clark-Casey (justincc)2012-08-031-1/+1
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-08-031-4/+4
| | | |\
| | | | * Update settings loading in AvatarFactoryModule which should have been in last...Justin Clark-Casey (justincc)2012-08-031-4/+4
| | | * | BulletSim: update DLLs and SOsRobert Adams2012-08-034-0/+0
| | | * | BulletSim: pass collision subscription information to the C++ code so collisi...Robert Adams2012-08-033-16/+45
| | | * | BulletSim: Add AddObjectForce to BulletSim API.Robert Adams2012-08-033-20/+38
| | | |/
| | | * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAp...Justin Clark-Casey (justincc)2012-08-033-23/+23
| | | * Restore SOG constructor chaining removed in recent 513b77b. This is not a fu...Justin Clark-Casey (justincc)2012-08-031-1/+1
| | | * Fix the recent windows compile error by putting newFont for case "R" in Vecto...Justin Clark-Casey (justincc)2012-08-031-3/+8
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-031-2/+2
| | | |\
| | | | * attempting to fix a build issueSignpostMarv2012-08-031-2/+2
| | | * | Move previously unadvertised SendPeriodicAppearanceUpdates setting from [Star...Justin Clark-Casey (justincc)2012-08-032-2/+15
| | | |/
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-08-071-0/+6
| |\ \ \
| | * \ \ Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster in...Melanie2012-08-071-0/+7
| | |\ \ \
| | * | | | Release http-in URLs when llResetScript is calledMelanie2012-08-071-0/+6
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-073-29/+96
|\ \ \ \ \ \ | |/ / / / /
| * | | | | use a bit more complex mesh key identifier, plus a bug fixUbitUmarov2012-08-073-29/+96
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-061-97/+97
|\ \ \ \ \ \ | |/ / / / /
| * | | | | *** TESTTTTT ** downgrade from .net 4.0 to .net3.5UbitUmarov2012-08-061-97/+97
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-067-55/+174
|\ \ \ \ \ \ | |/ / / / /
| * | | | | ** DANGER someone should stress test more ** release unused physics meshs, in...UbitUmarov2012-08-067-55/+174
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-053-15/+78
|\ \ \ \ \ \ | |/ / / / /
| * | | | | bug fix: keep sculpt bitmaps border pixels during resolution scaling.UbitUmarov2012-08-053-15/+78
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-053-449/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | ubitmeshing: mask out mirror and invert bits on sculpttype convertion.UbitUmarov2012-08-053-449/+12
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-042-8/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | *feature test* ubitode, let convex hull shape type work for prims otherUbitUmarov2012-08-041-6/+15
| * | | | | fix build on winUbitUmarov2012-08-041-2/+2
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-0424-302/+460
|\ \ \ \ \ \ | |/ / / / /
| * | | | | update ode.dll for windows so both 32b and 64b are now version 0.12 (32bUbitUmarov2012-08-042-0/+0
| | |/ / / | |/| | |
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-08-031-0/+7
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'careminster' into avinationMelanie2012-08-0320-299/+459
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' into careminsterMelanie2012-08-0320-299/+459
| | |\ \ \ | | | | |/ | | | |/|
| | | * | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,...Justin Clark-Casey (justincc)2012-08-033-3/+3
| | | * | Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this i...Justin Clark-Casey (justincc)2012-08-031-3/+4
| | | * | ImprovedTerseObjectUpdate packet does not support shape updates, thus schedul...SignpostMarv2012-08-031-1/+1
| | | * | Fixed a rare bug that caused Save OAR to fail because it thought it had timed...Oren Hurvitz2012-08-031-5/+11
| | | * | Save membership fee to the database when a group is created.Kevin Cozens2012-08-031-25/+25
| | | * | BulletSim: Debugging log statements added. Reduced size of updata buffer tryi...Robert Adams2012-08-027-7/+28
| | | * | minor: Comment out "Deleting asset" log messages for nowJustin Clark-Casey (justincc)2012-08-032-2/+4
| | | * | Delete old blank SOGSpamTestJustin Clark-Casey (justincc)2012-08-031-37/+0
| | | * | Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic ...Justin Clark-Casey (justincc)2012-08-031-253/+316
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-028-4/+55
| | | |\ \
| | | | * | Initialize the Rezzing object to UUID.ZeroMelanie2012-08-021-3/+4
| | | | * | reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-025-1/+29
| | | * | | Add simple draw test for the VectorRenderModuleJustin Clark-Casey (justincc)2012-08-022-1/+76
| * | | | | Make WaitGetScenePresence wait for up to 20 secondsMelanie2012-08-031-1/+1