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 '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
* | | 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
| | * BulletSim: change boolean parameters in the shape data from int's to float's ...Robert Adams2012-07-312-7/+11
| * | Look up the NPC module when the SensorRepeat class is created, rather than on...Justin Clark-Casey (justincc)2012-08-011-5/+6
| |/
| * Change exception log messages in XInventoryService connector to error rather ...Justin Clark-Casey (justincc)2012-08-011-9/+8
* | Merge branch 'master' into careminsterMelanie2012-08-0116-70/+288
|\ \ | |/
| * Resolve a deadlock between INPCModule and SensorRepeat by replacing the Senso...Justin Clark-Casey (justincc)2012-07-311-35/+43
| * Fix bug in SoundModule.TriggerSound() where every sound update to an avatar w...Justin Clark-Casey (justincc)2012-07-311-3/+6
| * Adds support to ScriptModuleComms for region modules to exportMic Bowman2012-07-313-2/+74
| * BulletSim: update the DLLs and SOs. This fixes the exception on shutdownRobert Adams2012-07-314-0/+0
| * BulletSim: add parameters and API calls for setting ERP and CFM.Robert Adams2012-07-316-29/+164
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-301-1/+11
| |\
| * | If we're fetching active gestures via the XInventoryServiceConnector, then pr...Justin Clark-Casey (justincc)2012-07-301-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
|\ \ \
| * \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-07-311-1/+3
| |\ \ \
| | * | | Correct StandUp position and rotationMelanie2012-07-301-1/+3
| * | | | Reverse a senseless change in the prioritizer. Why I would want avatars to re...Melanie2012-07-311-3/+9
| |/ / /