aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix merge issuesMelanie2012-10-073-10/+3
* Merge branch 'master' into careminsterMelanie2012-10-0719-86/+441
|\
| * 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-0610-24/+81
| * 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 Vector3.Zero return on TryParseConsoleVector() which fails on mono 2.4.3 ...Justin Clark-Casey (justincc)2012-10-051-0/+3
| * Add missing ConsoleUtil from last commitJustin Clark-Casey (justincc)2012-10-051-0/+111
| * Add "show object pos <start-coord> to <end-coord>" command to simulator console.Justin Clark-Casey (justincc)2012-10-052-0/+80
| * 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
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-051-2/+7
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-10-0429-348/+954
| | |\
| | * | One more abstraction for GridUser so that it can be overridden in a sub-class.Diva Canto2012-10-041-2/+7
| * | | refactor: Move OpenSim.Framework.PacketPool to OpenSim.Region.Clientstack.Lin...Justin Clark-Casey (justincc)2012-10-051-3/+5
| | |/ | |/|
| * | Make the asset retrieval concurrency a config switch. The current valueMic Bowman2012-10-041-3/+8
* | | Merge branch 'master' into careminsterMelanie2012-10-049-29/+268
|\ \ \ | |/ /
| * | Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| * | Output monitor data in response to console command on MainConsole.Instance ra...Justin Clark-Casey (justincc)2012-10-041-2/+2
| * | Add generic PercentageStat.Justin Clark-Casey (justincc)2012-10-042-3/+34
| * | Add experimental "slow frames" stat, available in "show stats" and via the mo...Justin Clark-Casey (justincc)2012-10-043-2/+158
| * | Soliciting for comments on smoothness of physics objects for this build.teravus2012-10-032-8/+46
| * | Fix the use of the wrong index when locating the assets associatedMic Bowman2012-10-031-1/+2
* | | Merge branch 'master' into careminsterMelanie2012-10-031-5/+19
|\ \ \ | |/ /
| * | Fix a viewer crash issueMelanie2012-10-031-1/+12
| * | I propose that 0.5m/step change for linear velocity is too big of a change to...teravus2012-10-031-1/+15
| * | Minor Modification, switch /2 to 0.5f in ODEPrim.Velocityteravus2012-10-021-4/+4
* | | Merge branch 'avination' into careminsterMelanie2012-10-031-1/+12
|\ \ \
| * | | Fix a viewer crash issueMelanie2012-10-031-1/+12
| * | | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
* | | | Merge branch 'master' into careminsterMelanie2012-10-0318-308/+647
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-0215-309/+598
| |\ \ \
| | * | | correcting typoSignpostMarv2012-10-021-3/+3
| | * | | taking into account the recent introduction of implicit operatorsSignpostMarv2012-10-021-3/+1
| | * | | added perms checking, duplicated functionality to methods that do not require...SignpostMarv2012-10-023-6/+86
| | * | | fixing copypastaSignpostMarv2012-10-021-1/+1
| | * | | implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-025-3/+72
| | * | | string format arguments in wrong orderSignpostMarv2012-10-021-1/+1
| | * | | BulletSim: Make parameter value defaults match what should be the default and...Robert Adams2012-10-022-14/+14
| | * | | BulletSim: Add ForcePosition and ForceOrientation to BSPhysObject and to its ...Robert Adams2012-10-023-5/+64
| | * | | BulletSim: Fix problem where box shapes were not being rebuilt if the shape t...Robert Adams2012-10-021-4/+6
| | * | | BulletSim: Fix linkset problem where delayed manipulations of child objects w...Robert Adams2012-10-021-10/+8
| | * | | BulletSim: call ForcePosition and ForceOrientation in BSDynamics so there is ...Robert Adams2012-10-021-39/+57
| | * | | Add Flush() method to LogWriter. Also correct line endings to Linux form.Robert Adams2012-10-021-161/+170
| | * | | BulletSim: fix the FloatOnWater code so avatars can normally go underwater.Robert Adams2012-10-021-1/+1