| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 2 | -2/+0 |
| |\ | |||||
| | * | Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op... | Diva Canto | 2015-09-04 | 2 | -2/+0 |
| * | | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 2 | -73/+92 |
| * | | bad merge? | UbitUmarov | 2015-09-01 | 3 | -43/+249 |
| |\ \ | |/ |/| | |||||
| | * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Merge branch 'master' into careminster | Melanie | 2013-07-29 | 1 | -2/+2 |
| | | |\ | |||||
| | * | | | Change OfflineMessageModule to support more differentiated return values and ... | Melanie Thielker | 2014-04-06 | 1 | -8/+47 |
| | |/ / | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-12-07 | 1 | -5/+5 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-30 | 1 | -14/+18 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 5 | -0/+10 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fix perms when linking an object. Set root part perms to the perms | Melanie | 2012-10-14 | 1 | -1/+1 |
| | * | | | | | | | Remove spammy debug for IM | Melanie | 2012-10-11 | 1 | -3/+3 |
| | * | | | | | | | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM | Melanie | 2012-09-09 | 1 | -0/+3 |
| | * | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-07-19 | 1 | -8/+11 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add some logging | Melanie | 2012-01-17 | 1 | -0/+41 |
| | * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-01-02 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix task inventory giving | Melanie | 2011-12-07 | 2 | -18/+10 |
| | * | | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix the offline message module to revert core changes and restore avn | Melanie | 2011-10-28 | 1 | -18/+28 |
| | * | | | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 2 | -50/+33 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 2 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge | Melanie | 2011-10-12 | 1 | -21/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge | Melanie | 2011-10-11 | 1 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | First set of merge fixes | Tom | 2011-09-07 | 1 | -51/+38 |
| | * | | | | | | | | | | | | | | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -3/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -0/+350 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | Remove a spammy debug | Melanie | 2011-03-23 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | throttle group notices to max of 4 threads at a time | Mike Rieker | 2011-02-20 | 1 | -14/+50 |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | Add MessageKey to section Messaging, a key that prevents injection of | Melanie | 2010-12-30 | 1 | -6/+25 |
| | * | | | | | | | | | | | | | | | | | | | Remove the restriction on communication across scopes. This will allow | Melanie | 2010-12-29 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | Remove some code that was meant to fool the viewer into thinking SLT. It never | Melanie | 2010-12-26 | 1 | -18/+19 |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Convert the scope id in the im session id to a URL variable. Fixes offline | Melanie | 2010-11-26 | 1 | -10/+2 |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 |
| | | |/ / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | | | | | | | | | Add group invites to the list of messages that get offlined | Melanie | 2010-10-10 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-26 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 1 | -1/+12 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 2 | -3/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |