aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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-057-61/+191
| |\ \
| | * | 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-057-60/+200
|\ \ \ \ | | |/ / | |/| |
| * | | 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-056-59/+199
| |\ \ \ | | |/ / | |/| / | | |/
| | * add nant distbin target0.6.9.rc1Justin Clark-Casey (justincc)2010-03-261-2/+37
| | | | | | | | | | | | this will delete all extraneous source code files and copy OpenSim.ini.example to OpenSim.ini
| | * comment out very probably unused dist and distdir nant targetsJustin Clark-Casey (justincc)2010-03-261-15/+17
| | |
| | * switch flavor to RC1Justin Clark-Casey (justincc)2010-03-261-1/+1
| | |
| | * remove milliseconds from console log againJustin Clark-Casey (justincc)2010-03-091-1/+1
| | |
| | * Fix bug where approximately half the time, attachments would rez only their ↵Justin Clark-Casey (justincc)2010-03-095-44/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-04-051-0/+4
|\ \ \ | |/ /
| * | Change land overlay to send group owned status properlyMelanie Thielker2010-03-231-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.
* | 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
|\ \
| * \ Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-03-182-193/+199
| |\ \ | | | | | | | | | | | | careminster
| | * | Prevent llTeleportAgentHome from affecting godsThomas Grimshaw2010-03-171-0/+3
| | | |
| | * | Debugger tags for VS2010Thomas Grimshaw2010-03-162-193/+196
| | | |
| * | | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-186-102/+21
| |/ / | | | | | | | | | really don't need two methods doing the same thing, but differently.
* | | Fix sit with autopilot.Kitto Flora2010-03-191-3/+5
|/ /
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-03-141-2/+5
|\ \
| * | Fix the delay in llGiveInventory so that it only takes effect when giving ↵CasperW2010-03-131-2/+5
| | | | | | | | | | | | inventory to an avatar (this now replicates SL behaviour)
* | | RotLookAt repaired; debug msg cleanup.Kitto Flora2010-03-144-444/+151
|/ /
* | Fix Rotation Lock. NOTE: This version had poor border crossing controlKitto Flora2010-03-122-24/+18
| |
* | Resolved mergeKitto Flora2010-03-1281-6386/+2871
|\ \
| * | Small consistency changeMelanie2010-03-071-1/+1
| | |
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-03-063-655/+84
| |\ \ | | | | | | | | | | | | careminster
| * \ \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-0681-6273/+2893
| |\ \ \ | | | |/ | | |/|
| | * | - implementing server 1.38 functionsunknown2010-03-065-10/+119
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | * | Remove a superfluous array creationMelanie2010-03-041-1/+0
| | | |
| | * | Fix a few compiler warnings.Jeff Ames2010-03-013-9/+0
| | | |
| | * | Formatting cleanup.Jeff Ames2010-03-011-33/+18
| | | |
| | * | fix bug where region settings loaded via an oar (water height, terrain ↵Justin Clark-Casey (justincc)2010-02-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | textures, etc.) were not being persisted to the database this meant that the loaded settings would disappear after a restart
| | * | minor formatting tweak - try to trigger a build on pandadahlia2010-02-221-1/+0
| | | |
| | * | add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitivedahlia2010-02-221-0/+35
| | | |
| | * | Minor formatting cleanup.Jeff Ames2010-02-222-36/+35
| | | |
| | * | Separate PhysX classes into separate files.Jeff Ames2010-02-224-770/+882
| | | |