| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -99/+104 |
| |\ |
|
| | * | Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -1/+0 |
| | * | Stop some places where we're trying to reset animations in child agents where... | Justin Clark-Casey (justincc) | 2011-12-02 | 1 | -100/+110 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-01 | 1 | -6/+11 |
| |\ \
| |/ |
|
| | * | On "show caps", stop excluding the seed cap but do exclude it elsewhere | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -1/+1 |
| | * | tabulate "show caps" output for easier readability | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -5/+10 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -37/+66 |
| |\ \
| |/ |
|
| | * | Fix the build break | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -1/+1 |
| | * | Look up a homeURL only when it's not null, in addition to not being string.Empty | Justin Clark-Casey (justincc) | 2011-11-16 | 1 | -1/+1 |
| | * | Enable log message to tell us what type of url is being requested from a user... | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -3/+3 |
| | * | fix build break on UserManagementModule. | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -7/+8 |
| | * | Do proper locking of UserManagementModule.m_UserCache when getting. | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -29/+57 |
| * | | Fix taking or returning locked objects losing permissions for owner | Melanie | 2011-11-12 | 1 | -1/+1 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-06 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-03 | 1 | -1/+1 |
| |\ \
| |/ |
|
| | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. | Dan Lake | 2011-11-02 | 1 | -1/+1 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 1 | -2/+2 |
| |\ \
| |/ |
|
| | * | set grp.RootPart.GroupPosition for code consistency (and readability) rather ... | Justin Clark-Casey (justincc) | 2011-10-28 | 1 | -2/+2 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 2 | -0/+2 |
| |\ \
| |/ |
|
| | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o... | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -0/+2 |
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+8 |
| |\ \
| |/ |
|
| | * | Start recording object updates per second statistic (analogue of agent update... | Justin Clark-Casey (justincc) | 2011-10-11 | 1 | -0/+8 |
| * | | Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+3 |
| |\ \
| |/ |
|
| | * | Allow monitoring of stats by region name | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -0/+3 |
| * | | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmerge | Melanie | 2011-10-12 | 15 | -20/+325 |
| |\ \
| |/ |
|
| | * | Add other region stats (total frame time, physics fps, etc.) currently missin... | Justin Clark-Casey (justincc) | 2011-10-10 | 15 | -20/+325 |
| * | | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge | Melanie | 2011-10-12 | 1 | -15/+35 |
| |\ \
| |/ |
|
| | * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -15/+35 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 1 | -1/+1 |
| | |\ |
|
| * | \ | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ \
| |/ / |
|
| | * | | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 1 | -1/+1 |
| * | | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ \
| | |/
| |/| |
|
| | * | | remove the pointless slashes on the end of the (5!) different server stat ret... | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
| | |/ |
|
| * | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 1 | -6/+6 |
| |\ \
| |/ |
|
| | * | Simplified IsInTransit property on ScenePresence and removed InTransit() whic... | Dan Lake | 2011-10-06 | 1 | -6/+6 |
| * | | Fix rezzing coalesced object broken by core merge | Melanie | 2011-10-12 | 1 | -54/+36 |
| * | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+0 |
| |\ \
| |/ |
|
| | * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -1/+0 |
| * | | Bring us up to date. | Tom | 2011-09-14 | 3 | -25/+41 |
| |\ \
| |/ |
|
| | * | Add extra log information when attachments fail validation | Justin Clark-Casey (justincc) | 2011-09-10 | 1 | -5/+11 |
| | * | reinstate the validation logging on teleport. A 'fail' of validation still d... | Justin Clark-Casey (justincc) | 2011-09-10 | 1 | -0/+2 |
| | * | Stop the UserManagementModule logging every user it adds for now | Justin Clark-Casey (justincc) | 2011-09-10 | 1 | -3/+3 |
| | * | Use scene presence agent id for rezzed object ownership rather than item owner. | Justin Clark-Casey (justincc) | 2011-09-08 | 1 | -7/+12 |
| | * | Add temporary debugging in HGInventoryBroker and RemoveXInventoryServiceConne... | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -2/+0 |
| | * | Try disabling the inconsistent attachment state check to see if this actually... | Justin Clark-Casey (justincc) | 2011-09-05 | 1 | -13/+18 |
| * | | First set of merge fixes | Tom | 2011-09-07 | 1 | -49/+49 |
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 6 | -472/+539 |
| |\ \
| |/ |
|
| | * | Stop NPCs losing attachments when the source avatar takes them off. | Justin Clark-Casey (justincc) | 2011-09-03 | 1 | -32/+35 |
| | * | Comment out Scene.CleanDroppedAttachments() and calls. | Justin Clark-Casey (justincc) | 2011-09-02 | 1 | -1/+1 |
