Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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) | |||||
| | | * | | | | Add missing licenses. Change relicensed LightShare module to proper BSD | Melanie | 2010-03-31 | 3 | -6/+79 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | licensing. | |||||
| | * | | | | | oops, add file missing from last commit | Justin Clark-Casey (justincc) | 2010-04-01 | 2 | -9/+80 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor out redundant method from GroupsMessagingModule | |||||
| | * | | | | | expose methods that allow region modules to send messages to groups | Justin Clark-Casey (justincc) | 2010-04-01 | 1 | -63/+81 | |
| | | | | | | | ||||||
| * | | | | | | Adding the groups update (Mantis #4646) | Melanie | 2010-04-02 | 4 | -294/+1543 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Thanks, mcortez. | |||||
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-31 | 2 | -0/+275 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | Remerge the LightShare bits that were pushed to core | |||||
| * | | | | | Adding the LightShare module and scripting API. This code was written by | Melanie | 2010-03-31 | 5 | -0/+925 | |
| | | | | | | | | | | | | | | | | | | | | | | | | TomMeta and was contributed by Meta7. | |||||
| * | | | | | Committing the LightShare code, which was developed by TomMeta of Meta7. | Melanie | 2010-03-31 | 9 | -8/+57 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | This allows scripts to set WindLight parameters for clients connecting to a region. Currently, this is only supported by the Meta7 viewer. | |||||
* | | | | | Rename Meta7Windlight to LightShare | Melanie | 2010-03-30 | 8 | -351/+76 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 41 | -563/+622 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | minor: commented out code removal | Justin Clark-Casey (justincc) | 2010-03-30 | 1 | -1/+0 | |
| | | | | | ||||||
| * | | | | Completely prevent full update packets being sent after kill object packets | Justin Clark-Casey (justincc) | 2010-03-30 | 1 | -6/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog This patch prevents this by recording kills in LLClientView | |||||
| * | | | | fix build break. First argument of GetGroupRecord is not a uuid | Justin Clark-Casey (justincc) | 2010-03-29 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Remove a redundant method body | Melanie | 2010-03-29 | 1 | -21/+1 | |
| | | | | | ||||||
| * | | | | Stab one bug. When joining an estate with a new region, make sure it's also | Melanie | 2010-03-28 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | used on first run and not only later. | |||||
| * | | | | May fix mantis #4613 | Diva Canto | 2010-03-27 | 1 | -1/+2 | |
| | | | | | ||||||
| * | | | | * Fixed a dictionary value retrieval in GroupsModule | John Hurliman | 2010-03-26 | 1 | -2/+3 | |
| | | | | | ||||||
| * | | | | * Fixed a bug with null value handling in WebUtil.BuildQueryString() | John Hurliman | 2010-03-26 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Changed the null check back in estate manager setup but fixed the case for an existing account being found * Implemented SetPassword() in the SimianGrid auth connector | |||||
| * | | | | Fixed a backwards null check that was preventing estate owner from being set ↵ | John Hurliman | 2010-03-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | and a misleading error message (in grid mode it tries to get a user, not create one) | |||||
| * | | | | replace recent IModule.GetGroup() with better GetGroupRecord(string name) | Justin Clark-Casey (justincc) | 2010-03-26 | 3 | -27/+36 | |
| | | | | | ||||||
| * | | | | minor: some debugging information and spacing changes to group module | Justin Clark-Casey (justincc) | 2010-03-25 | 4 | -8/+8 | |
| | | | | | ||||||
| * | | | | add get group by name method to IGroupsModule | Justin Clark-Casey (justincc) | 2010-03-25 | 3 | -13/+53 | |
| | | | | | ||||||
| * | | | | fix unit tests broken by commit dcf18689b9ab29d4ceb2348bb56fc1f77a7a8912 | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | can't prompt for estate owner in unit tests | |||||
| * | | | | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-03-25 | 2 | -9/+9 | |
| | | | | | | | | | | | | | | | | | | | | do this in callers so that we know who is setting up these things | |||||
| * | | | | First stage of the new interactive region creation. This will allow creation | Melanie | 2010-03-23 | 2 | -1/+120 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of a region and joining it to an existing estate or creating a new estate, as well as creating an estate owner if in standalone, and assigning estate owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as I can't develop or test for either SQLite or MSSQL. | |||||
| * | | | | Remove the reading of estate_settings.xml and the associated processing of | Melanie | 2010-03-22 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | defaults. Adding code to facilitate estate creation / managemment as part of first time start up | |||||
| * | | | | Fix a nullref in permissions when returning objects via right-click | Melanie | 2010-03-20 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-19 | 6 | -102/+112 | |
| |\ \ \ \ |