aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | Remove another superflouous IsActive setMelanie2012-08-031-2/+0
* | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-0/+7
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | on presence close(), release animator and OnRegionHeartbeatEnd eventUbitUmarov2012-08-031-0/+7
| |/ / / /
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-031-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove a merge artefaci in IsActive handling and restore commented out correc...Melanie2012-08-031-2/+1
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-032-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | minor change avoiding a null referenceUbitUmarov2012-08-031-2/+4
| * | | | clientview IsActive use is broken. Suspend it's use keeping it true ( toUbitUmarov2012-08-031-3/+3
* | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-08-032-0/+10
|\ \ \ \ \ | |/ / / /
| * | | | Make sure the position of a loggin-in agent is within region boundaries sinceMelanie2012-08-031-0/+9
| * | | | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
| |/ / /
* | | | merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster...ubit2012-08-02101-1375/+3578
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into careminsterMelanie2012-08-0113-26/+53
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-011-0/+3
| | |\ \ | | | |/
| | | * Fix a bug in pCampbot grabbing behaviour where an exception would be thrown i...Justin Clark-Casey (justincc)2012-08-011-0/+3
| | * | Create the ability for physics modules to request assets on demand byMelanie2012-08-013-0/+22
| | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-017-12/+14
| | |\
| | | * BulletSim: fix problem where resizing a primary shape (cube or sphere) would ...Robert Adams2012-07-316-5/+3