Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-13 | 18 | -201/+644 |
|\ | |||||
| * | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-13 | 5 | -2/+255 |
| |\ | |||||
| | * | Changed the GetTextureModule backport to work with the 0.6.9 codebase | John Hurliman | 2010-04-08 | 1 | -2/+11 |
| | | | |||||
| | * | Backported GetTextureModule and IAssetService.GetCached() | John Hurliman | 2010-04-08 | 5 | -2/+246 |
| | | | |||||
| * | | Fixed LINEAR_MOTOR Z drive, Mantis #30 | Kitto Flora | 2010-04-11 | 1 | -23/+35 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | lcc | 2010-04-10 | 11 | -78/+201 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | resolved Conflicts: OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | ||||
| | * | | guarantee that a script engine's GetScriptErrors() will not be called | Mike Rieker | 2010-04-10 | 3 | -12/+71 |
| | | | | | | | | | | | | | | | | | | | | until after its OnRezScript() returns so that script compile error messages can be retrieved | ||||
| | * | | re-fixing this darn file | lcc | 2010-04-10 | 1 | -0/+11 |
| | | | | |||||
| | * | | Fixing Trap | lcc | 2010-04-10 | 1 | -11/+0 |
| | | | | |||||
| | * | | Add Scene.SnmpService, which is of type ISnmpModule and, if nun-null, can | Melanie | 2010-04-09 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | be used to send snmp alerts | ||||
| | * | | Implement cmGetAvatarList(). This returns a strided list of all avatars in ↵ | Thomas Grimshaw | 2010-04-07 | 3 | -60/+87 |
| | | | | | | | | | | | | | | | | the region, including their UUID, position and name. The radar is often the most taxing scripts on a sim, this function can help radars reduce their impact by 66% by eliminating the need for sensors. | ||||
| | * | | Increase the amount of time we wait for a teleport to complete. This allows ↵ | Thomas Grimshaw | 2010-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | teleportation to a remote region without a local connection to the asset server without timing out. | ||||
| | * | | Fix llDialog responses so that they can be heard throughout the region. This ↵ | Thomas Grimshaw | 2010-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | now conforms to the behaviour in SL. ( http://bugs.meta7.com/view.php?id=13 ) | ||||
| | * | | Fix llLookAt so that it doesn't "roll" the object and more closely imitates ↵ | Thomas Grimshaw | 2010-04-07 | 1 | -4/+16 |
| | | | | | | | | | | | | | | | | the behaviour in SL. ( http://bugs.meta7.com/view.php?id=28 ) | ||||
| | * | | Add CHANGED_REGION_START (alias for CHANGED_REGION_RESTART as per LL Jira ↵ | Thomas Grimshaw | 2010-04-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | SVC-3773) | ||||
| | * | | Implement PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE | Thomas Grimshaw | 2010-04-07 | 1 | -0/+10 |
| | | | | |||||
| * | | | Adding ColdStart event | lcc | 2010-04-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | dding this deleted file... | lcc | 2010-04-10 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-04-05 | 2 | -22/+37 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2010-04-05 | 1 | -22/+26 |
| | |\ \ | |||||
| | | * | | Fix up my own shoddy code! Fixes prim rez break. Whups! | Thomas Grimshaw | 2010-04-05 | 1 | -22/+26 |
| | | | | | |||||
| | * | | | Add the ISnmpModule interface definition to Careminster release | Melanie Thielker | 2010-04-05 | 1 | -0/+11 |
| | |/ / | |||||
| * | | | 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://3dhosting.de/var/git/careminster | Kitto Flora | 2010-04-05 | 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. | ||||
* | | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-05 | 4 | -6/+11 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | 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 |
| | | | | |||||
| * | | | Change land overlay to send group owned status properly | Melanie Thielker | 2010-03-23 | 1 | -0/+4 |
| | |/ | |/| | |||||
| * | | 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 |
| |\ \ | |||||
| * | | | Fix sit with autopilot. | Kitto Flora | 2010-03-19 | 1 | -3/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-05 | 14 | -502/+2047 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-04 | 3 | -46/+57 |
| |\ \ \ \ | |||||
| | * | | | | Last commit was too fast... must override. | Diva Canto | 2010-04-03 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | * Fail storing user accounts in the remote connector. | Diva Canto | 2010-04-03 | 1 | -0/+6 |
| | | | | | | |||||
| | * | | | | * Made UserAccountService handle UserLevel, UserFlags and UserTitle ↵ | Diva Canto | 2010-04-03 | 2 | -106/+106 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriately. * Removed Store service from the UserAccount handler. | ||||
| | * | | | | Don't append ACKs to zerocoded packets. Although this should fine in theory, ↵ | John Hurliman | 2010-04-02 | 1 | -15/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic | ||||
| * | | | | | Patch from mcortez. This appears to be a huge change to the groups module | Melanie | 2010-04-04 | 5 | -231/+337 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | and I can't say if this is beneficial or destructive due to the way it was delivered (zipfile). Pushing this on faith alone. | ||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-02 | 17 | -75/+1228 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-01 | 15 | -12/+1076 |
| | |\ \ \ \ | |||||
| | | * | | | | First attempt at fixing mantis #4641. It's better but there are now some ↵ | Diva Canto | 2010-03-31 | 4 | -11/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues with permissions. (looks like my commit is going to touch CM files, I'm going to let it do it - eof only) |