aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-1325-203/+694
|\
| * Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-1310-3/+296
| |\
| | * Changed the GetTextureModule backport to work with the 0.6.9 codebaseJohn Hurliman2010-04-082-363/+11
| | |
| | * Backported WebUtil.cs from master to 0.6.9-postfixes to fix the build breakJohn Hurliman2010-04-081-0/+361
| | |
| | * Backported GetTextureModule and IAssetService.GetCached()John Hurliman2010-04-0810-3/+287
| | |
| * | Fixed LINEAR_MOTOR Z drive, Mantis #30Kitto Flora2010-04-111-23/+35
| | |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterlcc2010-04-1011-78/+201
| |\ \ | | | | | | | | | | | | | | | | | | | | resolved Conflicts: OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
| | * | guarantee that a script engine's GetScriptErrors() will not be calledMike Rieker2010-04-103-12/+71
| | | | | | | | | | | | | | | | | | | | until after its OnRezScript() returns so that script compile error messages can be retrieved
| | * | re-fixing this darn filelcc2010-04-101-0/+11
| | | |
| | * | Fixing Traplcc2010-04-101-11/+0
| | | |
| | * | Add Scene.SnmpService, which is of type ISnmpModule and, if nun-null, canMelanie2010-04-091-0/+14
| | | | | | | | | | | | | | | | be used to send snmp alerts
| | * | Implement cmGetAvatarList(). This returns a strided list of all avatars in ↵Thomas Grimshaw2010-04-073-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 Grimshaw2010-04-071-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 Grimshaw2010-04-071-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 Grimshaw2010-04-071-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 Grimshaw2010-04-071-0/+1
| | | | | | | | | | | | | | | | SVC-3773)
| | * | Implement PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLEThomas Grimshaw2010-04-071-0/+10
| | | |
| * | | Adding ColdStart event lcc2010-04-101-0/+1
| | | |
| * | | dding this deleted file...lcc2010-04-101-2/+2
| |/ /
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-04-053-24/+39
| |\ \
| | * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2010-04-051-22/+26
| | |\ \
| | | * \ Merge branch 'master' of ssh://TOR/var/git/careminsterThomas Grimshaw2010-04-051-2/+2
| | | |\ \
| | | * | | Fix up my own shoddy code! Fixes prim rez break. Whups!Thomas Grimshaw2010-04-051-22/+26
| | | | | |
| | * | | | Add the ISnmpModule interface definition to Careminster releaseMelanie Thielker2010-04-051-0/+11
| | | |/ / | | |/| |
| | * | | Test commitMelanie Thielker2010-04-051-1/+1
| | | | |
| | * | | Bump version numberMelanie Thielker2010-04-051-1/+1
| | |/ /
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-04-055-18/+54
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://TOR/var/git/careminsterThomas Grimshaw2010-04-056-44/+137
| | |\ \
| | | * | Fix some overlooked merge conflicts that got committedMelanie2010-04-051-10/+0
| | | | |
| | * | | This commit adds some randomness to object persistence. It's a Work In ↵Thomas Grimshaw2010-04-051-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 Grimshaw2010-04-054-4/+12
| | | | | | | | | | | | | | | | | | | | so it can be reverted then.
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-04-056-43/+146
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-04-051-0/+4
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | ChODE Only: Corrected Heightmap load to iliminate crack at 255M. Added ↵kitto2010-04-042-156/+157
| | | | | | | | | | | | | | | | | | | | 'fence' option to prevent physical objects crossing region border.
* | | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-055-6/+12
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-04-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | careminster
| | * | | | Fixed Ban and parcel exclusion. Need to fix the parcel chat toolcc2010-04-041-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-055-42/+145
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | switch flavor to RC1Justin Clark-Casey (justincc)2010-03-261-1/+1
| | | |
| | * | Fix bug where approximately half the time, attachments would rez only their ↵Justin Clark-Casey (justincc)2010-03-094-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 changeMelanie2010-03-071-1/+1
| | | |
| * | | Change land overlay to send group owned status properlyMelanie Thielker2010-03-231-0/+4
| | |/ | |/|
| * | Update acceleration to 0 on no tphysical.Kitto Flora2010-03-191-1/+3
| | |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-03-198-295/+220
| |\ \
| * | | Fix sit with autopilot.Kitto Flora2010-03-191-3/+5
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-0522-526/+2081
|\ \ \ \
| * \ \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-048-62/+78
| |\ \ \ \
| | * | | | * Guard against null in last commitDiva Canto2010-04-031-1/+2
| | | | | |
| | * | | | Last commit was too fast... must override.Diva Canto2010-04-032-2/+2
| | | | | |
| | * | | | * Fail storing user accounts in the remote connector.Diva Canto2010-04-031-0/+6
| | | | | |