aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-1227-529/+879
|\
| * BulletSim: only use native sphere shape if it is a sphere.Robert Adams2012-10-121-1/+2
| * Get rid of accidental scene start left in ScenePresenceAutopilotTestsJustin Clark-Casey (justincc)2012-10-121-1/+0
| * Fix problems with regression tests by allowing invoke of Update() with a fini...Justin Clark-Casey (justincc)2012-10-122-3/+5
| * Add "active true|false" to "debug scene" console command.Justin Clark-Casey (justincc)2012-10-122-6/+47
| * minor: Use && instead of & when deciding whether to print Improve/ObjectUpdat...Justin Clark-Casey (justincc)2012-10-121-1/+1
| * minor: Fix bug in categorization of blocks reused stat from packetpoolJustin Clark-Casey (justincc)2012-10-121-1/+1
| * Add AgentUpdate to PacketPool. This is the most common inbound packet from v...Justin Clark-Casey (justincc)2012-10-123-5/+28
| * BulletSim: fix problem with some shapes (like cylinders) being implemented as...Robert Adams2012-10-111-1/+1
| * Fix percentage stats to multiply by 100. Adjust container name for packetpoo...Justin Clark-Casey (justincc)2012-10-121-2/+2
| * Enable reuse of data blocks for ImprovedTerseObjectUpdate using existing Pack...Justin Clark-Casey (justincc)2012-10-121-1/+3
| * Fix packetpool for ImprovedTerseObjectUpdate packets.Justin Clark-Casey (justincc)2012-10-113-5/+15
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-1110-202/+316
| |\
| | * BulletSim: remove some unused API2 calls because they were removed from Bulle...Robert Adams2012-10-112-14/+2
| | * BulletSim: normalize physics FPS to 45 (for real this time).Robert Adams2012-10-111-2/+2
| | * BulletSim: normalize physics FPS to 45.Robert Adams2012-10-111-3/+4
| | * BulletSim: Use full linkset mass when computing vehicle gravity force. Add ta...Robert Adams2012-10-113-11/+16
| | * BulletSim: Change defaults for constraint CFM and ERP to make large linksets ...Robert Adams2012-10-112-11/+8
| | * BulletSim: cosmetic changes (comments and renaming). Give mass to terrain to ...Robert Adams2012-10-117-52/+74
| | * BulletSim: Add Force* operations to objects to allow direct push to engine.Robert Adams2012-10-117-29/+100
| | * BulletSim: Fix crash when linking large physical linksets.Robert Adams2012-10-118-102/+132
| * | Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-112-45/+70
| |/
| * Assign endVector before control leaves ObjectCommandsModule.TryParseVectorRan...Justin Clark-Casey (justincc)2012-10-111-0/+2
| * Add "delete object pos <start-coord> to <end-coord>" console command.Justin Clark-Casey (justincc)2012-10-101-24/+85
| * Correct osSetContentType() threat check to query osSetContentType rather than...Justin Clark-Casey (justincc)2012-10-101-1/+3
| * Remove osDropAttachment threat level check wrongly placed in OSSL_Api.ShoutEr...Justin Clark-Casey (justincc)2012-10-101-1/+0
| * minor: Add method doc to EventManager.OnNewClient, OnClientLogin, ClientClose...Justin Clark-Casey (justincc)2012-10-101-0/+14
| * Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to preve...Justin Clark-Casey (justincc)2012-10-103-219/+265
| * minor: elaborate method doc on Scene.NewUserConnection()Justin Clark-Casey (justincc)2012-10-091-6/+13
| * av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - No...teravus2012-10-091-2/+9
| * Add config option to plant avatar where they are reducing avatar avatar 'push...teravus2012-10-092-3/+9
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas...Justin Clark-Casey (justincc)2012-10-094-4/+7
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2012-10-0810-41/+111
| |\
| * | Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ...Dan Lake2012-10-052-5/+5
| * | Trigger ObjectAddedToScene when loading objects from oarfile. Already trigger...Dan Lake2012-10-051-1/+8
* | | Fix merge issuesMelanie2012-10-073-10/+3
* | | Merge branch 'master' into careminsterMelanie2012-10-0714-75/+538
|\ \ \ | | |/ | |/|
| * | refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is...Justin Clark-Casey (justincc)2012-10-061-20/+20
| * | Make UserSessionID a class rather than a struct, so that later updates to val...Justin Clark-Casey (justincc)2012-10-061-2/+16
| * | On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-069-20/+76
| |/
| * Fix bug in implementation of "show part pos" that would not filter probably.Justin Clark-Casey (justincc)2012-10-051-40/+25
| * Add "show part pos" console command to match "show object pos"Justin Clark-Casey (justincc)2012-10-051-0/+72
| * refactor: eliminate some now duplicate code in ObjectCommandsModuleJustin Clark-Casey (justincc)2012-10-051-34/+25
| * Add "show object pos <start-coord> to <end-coord>" command to simulator console.Justin Clark-Casey (justincc)2012-10-051-0/+67
| * minor: Add missing license information from the top of IUserManagementJustin Clark-Casey (justincc)2012-10-051-1/+28
| * Finally fix build break by allowing UserManagementModule (which constructs a ...Justin Clark-Casey (justincc)2012-10-051-0/+1
| * Print number of objects found with "show object name" and "show part name" si...Justin Clark-Casey (justincc)2012-10-051-12/+4
| * Forgot to actually remove the packetpool set code from scene.Justin Clark-Casey (justincc)2012-10-051-7/+0
| * Read PacketPool config in LLUDPServer with other config params rather than in...Justin Clark-Casey (justincc)2012-10-051-0/+9
| * refactor: Move OpenSim.Framework.PacketPool to OpenSim.Region.Clientstack.Lin...Justin Clark-Casey (justincc)2012-10-051-0/+249