Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | Groups V2 -- fix mantis #6666 | Diva Canto | 2013-06-08 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-08 | 2 | -1/+30 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-07 | 2 | -1/+30 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-07 | 5 | -8/+14 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | minor: Comment out debug logging (at warn level) about number of objects forc... | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -1/+1 | |
| | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | Put the configuration back in FetchInventoryDesc2 cap. | Diva Canto | 2013-06-07 | 1 | -0/+29 | |
| * | | | | | | | | | | | | | Merge commit '75631e0267dbf58253dfcf6327b4d65f35bbaa6d' into careminster | Melanie | 2013-06-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Supply proper type information for the various types of requests | Melanie | 2013-06-07 | 3 | -9/+8 | |
| | * | | | | | | | | | | | | Adding Avination's PollService to round out the HTTP inventory changes | Melanie | 2013-06-07 | 9 | -236/+220 | |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-07 | 5 | -8/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | minor: add dr0berts to contributors list | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -2/+3 | |
| | * | | | | | | | | | | | Fix regression where multiple close agents could be sent to the wrong neighbo... | Justin Clark-Casey (justincc) | 2013-06-07 | 1 | -1/+6 | |
| | * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-06-07 | 2 | -4/+27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Mantis #6620 (removed debug message) | Diva Canto | 2013-06-07 | 1 | -1/+1 | |
| | * | | | | | | | | | | | In LocalFriendshipTerminated, send the original client's agentId to the frien... | Donnie Roberts | 2013-06-07 | 2 | -4/+4 | |
| * | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-06 | 2 | -3/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-06 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-06-05 | 13 | -4/+261 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Strengthen some assumptions. | Diva Canto | 2013-06-05 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | Fix keyframe motion copyright | Melanie | 2013-06-06 | 1 | -3/+26 | |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'avination-current' into careminster | Melanie | 2013-06-06 | 29 | -52/+559 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-06 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Database persistence for keyframes. Contains a Migration. | Melanie | 2013-06-06 | 2 | -4/+32 | |
| * | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-06 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Hook up Keyframe motion to almost everything. Failing to cross a sim border | Melanie | 2013-06-06 | 11 | -0/+229 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Committing Avination's Keyframe module. This is not hooked up yet and will do... | Melanie | 2013-06-06 | 1 | -0/+766 | |
| | * | | | | | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2013-06-05 | 4 | -63/+343 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-06-05 | 4 | -37/+84 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-06-05 | 1 | -14/+16 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Avoid a deadlock where a script can attempt to take a ScriptInstance.m_Script... | Justin Clark-Casey (justincc) | 2013-06-05 | 1 | -11/+21 | |
| | | * | | | | | | | | | | | | Port Avination's inventory send throttling | Melanie | 2013-06-05 | 3 | -52/+322 | |
| * | | | | | | | | | | | | | | Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster | Melanie | 2013-06-06 | 4 | -31/+65 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Prevent processing for Npc | BlueWall | 2013-06-05 | 1 | -1/+3 | |
| | * | | | | | | | | | | | | | Cleanup | BlueWall | 2013-06-05 | 1 | -5/+0 | |
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Remove a couple of orphaned lines | BlueWall | 2013-06-05 | 1 | -3/+0 | |
| | * | | | | | | | | | | | | Make locking more uniform | BlueWall | 2013-06-05 | 1 | -14/+19 | |
| | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | BulletSim: default PhysicsTimeStep to same as the simulator's | Robert Adams | 2013-06-05 | 1 | -1/+1 | |
| | * | | | | | | | | | | | BulletSim: fix corner case when rebuilding a compound linkset while | Robert Adams | 2013-06-05 | 1 | -11/+46 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-06-04 | 34 | -262/+4565 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | New HttpServer_OpenSim.dll with increased limits on number of connections, re... | Diva Canto | 2013-06-04 | 1 | -0/+0 | |
| | * | | | | | | | | | | BulletSim: experimental movement of physics execution off of heartbeat | Robert Adams | 2013-06-01 | 3 | -73/+209 | |
| | * | | | | | | | | | | Adding standard OpenSim header to source files | BlueWall | 2013-05-31 | 8 | -0/+216 | |
| | * | | | | | | | | | | Adding back the BasicProfileModule | BlueWall | 2013-05-31 | 3 | -75/+193 | |
| | * | | | | | | | | | | Remove unnecessary m_scenes and m_scene from AsyncCommandManager. | Justin Clark-Casey (justincc) | 2013-05-31 | 1 | -6/+1 | |
| | * | | | | | | | | | | Lock areas of AsyncCommandManager where multiple threads could try to access/... | Justin Clark-Casey (justincc) | 2013-05-31 | 1 | -111/+177 | |
| | * | | | | | | | | | | refactor: Remove unused AsyncCommandManager.PleaseShutdown | Justin Clark-Casey (justincc) | 2013-05-31 | 1 | -19/+1 | |
| | * | | | | | | | | | | Fill in fields with default values on profile creation | BlueWall | 2013-05-31 | 1 | -2/+48 | |
| | * | | | | | | | | | | Trigger Jenkins build | BlueWall | 2013-05-30 | 1 | -0/+1 | |
| | * | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2013-05-30 | 20 | -178/+3727 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'work' contains UserProfiles with Robust service and updates reg... | BlueWall | 2013-05-30 | 20 | -178/+3727 | |
| | | |\ \ \ \ \ \ \ \ \ \ |