Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-04-05 | 3 | -16/+52 |
|\ | |||||
| * | Merge branch 'master' of ssh://TOR/var/git/careminster | Thomas Grimshaw | 2010-04-05 | 5 | -44/+136 |
| |\ | |||||
| | * | Fix some overlooked merge conflicts that got committed | Melanie | 2010-04-05 | 1 | -10/+0 |
| | | | |||||
| * | | This commit adds some randomness to object persistence. It's a Work In ↵ | Thomas Grimshaw | 2010-04-05 | 1 | -4/+42 |
| | | | | | | | | | | | | Progress, I am working on improving this to a tiered approach. | ||||
| * | | Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 ↵ | Thomas Grimshaw | 2010-04-05 | 2 | -2/+10 |
| | | | | | | | | | | | | so it can be reverted then. | ||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-04-05 | 5 | -43/+145 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-04-05 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | careminster | ||||
| | * | | Fixed Ban and parcel exclusion. Need to fix the parcel chat too | lcc | 2010-04-04 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 4 | -42/+144 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-09 | 4 | -43/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. Backport from head. | ||||
| | * | Small consistency change | Melanie | 2010-03-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-04-05 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | Change land overlay to send group owned status properly | Melanie Thielker | 2010-03-23 | 1 | -0/+4 |
| | | | |||||
* | | | ChODE Only: Corrected Heightmap load to iliminate crack at 255M. Added ↵ | kitto | 2010-04-04 | 2 | -156/+157 |
|/ / | | | | | | | 'fence' option to prevent physical objects crossing region border. | ||||
* | | Update acceleration to 0 on no tphysical. | Kitto Flora | 2010-03-19 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-03-19 | 8 | -295/+220 |
|\ \ | |||||
| * \ | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-03-18 | 2 | -193/+199 |
| |\ \ | | | | | | | | | | | | | careminster | ||||
| | * | | Prevent llTeleportAgentHome from affecting gods | Thomas Grimshaw | 2010-03-17 | 1 | -0/+3 |
| | | | | |||||
| | * | | Debugger tags for VS2010 | Thomas Grimshaw | 2010-03-16 | 2 | -193/+196 |
| | | | | |||||
| * | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 6 | -102/+21 |
| |/ / | | | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
* | | | Fix sit with autopilot. | Kitto Flora | 2010-03-19 | 1 | -3/+5 |
|/ / | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-03-14 | 1 | -2/+5 |
|\ \ | |||||
| * | | Fix the delay in llGiveInventory so that it only takes effect when giving ↵ | CasperW | 2010-03-13 | 1 | -2/+5 |
| | | | | | | | | | | | | inventory to an avatar (this now replicates SL behaviour) | ||||
* | | | RotLookAt repaired; debug msg cleanup. | Kitto Flora | 2010-03-14 | 4 | -444/+151 |
|/ / | |||||
* | | Fix Rotation Lock. NOTE: This version had poor border crossing control | Kitto Flora | 2010-03-12 | 2 | -24/+18 |
| | | |||||
* | | Resolved merge | Kitto Flora | 2010-03-12 | 59 | -6280/+2711 |
|\ \ | |||||
| * | | Small consistency change | Melanie | 2010-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-03-06 | 3 | -655/+84 |
| |\ \ | | | | | | | | | | | | | careminster | ||||
| * \ \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 59 | -6167/+2733 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | - implementing server 1.38 functions | unknown | 2010-03-06 | 5 | -10/+119 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | Remove a superfluous array creation | Melanie | 2010-03-04 | 1 | -1/+0 |
| | | | | |||||
| | * | | fix bug where region settings loaded via an oar (water height, terrain ↵ | Justin Clark-Casey (justincc) | 2010-02-26 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | textures, etc.) were not being persisted to the database this meant that the loaded settings would disappear after a restart | ||||
| | * | | Separate PhysX classes into separate files. | Jeff Ames | 2010-02-22 | 4 | -770/+882 |
| | | | | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2010-02-22 | 2 | -5/+5 |
| | | | | |||||
| | * | | Formatting cleanup. | Jeff Ames | 2010-02-20 | 2 | -74/+59 |
| | | | | |||||
| | * | | Apply http://opensimulator.org/mantis/view.php?id=4495 | Justin Clark-Casey (justincc) | 2010-02-19 | 2 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | Adds IsChildAgent property to IAvatar in MRM. Thanks ziah | ||||
| | * | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | forestall bug reports about the Command error: ↵ | Justin Clark-Casey (justincc) | 2010-02-19 | 3 | -8/+86 |
| | | | | | | | | | | | | | | | | System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is | ||||
| | * | | minor: Make FlotsamAssetCache default loglevel 0 to match that given in ↵ | Justin Clark-Casey (justincc) | 2010-02-19 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | bin/config-include/FlotsamCache.ini.example | ||||
| | * | | Change handling of the SYSTEMIP constant to be more sane. | Melanie | 2010-02-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This will now choose the first network interface IP address, or the loopback interface if no external interfaces are found. It will log the IP address used as [NETWORK]: Using x.x.x.x for SYSTEMIP. | ||||
| | * | | remove old commented out switch statement in LLClientView since this has ↵ | Justin Clark-Casey (justincc) | 2010-02-17 | 1 | -4845/+2 |
| | | | | | | | | | | | | | | | | successfully been split into separate methods for quite some time now | ||||
| | * | | minor: fix error inserting field in log message | Justin Clark-Casey (justincc) | 2010-02-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-16 | 44 | -364/+1524 |
| | |\ \ | |||||
| | | * | | Formatting cleanup. | Jeff Ames | 2010-02-15 | 18 | -181/+178 |
| | | | | | |||||
| | | * | | Fixes a bug in the previous patch. | Revolution | 2010-02-15 | 1 | -18/+13 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | | * | | Plug a small hole | Melanie | 2010-02-14 | 1 | -0/+3 |
| | | | | | |||||
| | | * | | Revolution is on the roll again! :) | Revolution | 2010-02-14 | 32 | -215/+1380 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events). Direct flames and kudos to Revolution, please Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object ↵ | Justin Clark-Casey (justincc) | 2010-02-16 | 2 | -11/+26 |
| | |/ / | | | | | | | | | | | | | instead of void | ||||
* | | | | Dynamics Integration Part 1 | Kitto Flora | 2010-03-11 | 3 | -1756/+1644 |
| |_|/ |/| | | |||||
* | | | Fix Physics angular reference frame. | Kitto Flora | 2010-03-04 | 3 | -655/+84 |
|/ / |