| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+12 |
|\ |
|
| * | Instead of adding stat agentMS in all kinds of places, calculate it instead i... | Justin Clark-Casey (justincc) | 2011-10-06 | 1 | -1/+12 |
* | | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge | Melanie | 2011-10-12 | 1 | -8/+18 |
|\ \
| |/ |
|
| * | Make reported sim fps more accurate, in line with frame time ms | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -8/+18 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-03 | 1 | -45/+42 |
| |\ |
|
* | \ | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+1 |
|\ \ \
| |/ / |
|
| * | | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 1 | -1/+1 |
* | | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 1 | -40/+44 |
|\ \ \
| | |/
| |/| |
|
| * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -45/+42 |
| |/ |
|
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+3 |
|\ \
| |/ |
|
| * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -3/+3 |
* | | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+67 |
|\ \
| |/ |
|
| * | Move code which handles NPC movement into Scene so that this can also be used... | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -0/+67 |
* | | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -82/+0 |
|\ \
| |/ |
|
| * | Correctly create a freshly created estate owner's default items and avatar en... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -82/+0 |
* | | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Write code to create minimum necessary body parts/clothing and avatar entries... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -0/+1 |
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -14/+51 |
|\ \
| |/ |
|
| * | Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -8/+10 |
| * | In an object return message, send a null-terminated empty string in binary bu... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -1/+3 |
| * | stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is... | Justin Clark-Casey (justincc) | 2011-09-12 | 1 | -1/+1 |
| * | Save the default terrain texture UUIDs for a new region instead of leaving th... | Justin Clark-Casey (justincc) | 2011-09-09 | 1 | -1/+36 |
* | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -34/+53 |
* | | First set of merge fixes | Tom | 2011-09-07 | 1 | -35/+0 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -117/+191 |
|\ \
| |/ |
|
| * | Comment out Scene.CleanDroppedAttachments() and calls. | Justin Clark-Casey (justincc) | 2011-09-02 | 1 | -36/+36 |
| * | Eliminate pointless checks of SOG.RootPart != null | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -10/+4 |
| * | Remove pointless cluttering SOP.ParentGroup != null checks. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -44/+38 |
| * | minor: remove already processed avatar null check in Scene.RemoveClient() | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -1/+1 |
| * | refactor: move SP.SaveChangedAttachments() fully into AttachmentsModule | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -2/+2 |
| * | refactor: Move ScenePresence.RezAttachments() into AttachmentsModule | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -1/+1 |
| * | refactor: migrate DropObject handling fully into AttachmentsModule from Scene | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -2/+0 |
| * | refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid poin... | Justin Clark-Casey (justincc) | 2011-08-27 | 1 | -2/+2 |
| * | Stop NPC's getting hypergrid like names in some circumstances. | Justin Clark-Casey (justincc) | 2011-08-19 | 1 | -14/+28 |
| * | Don't try to save changed attachment states when an NPC with attachments is r... | Justin Clark-Casey (justincc) | 2011-08-18 | 1 | -4/+5 |
| * | Added console command "delete object outside" to delete all objects outside r... | Snoopy Pfeffer | 2011-08-15 | 1 | -2/+37 |
| * | Stop trying to deregister caps or close child agents when an NPC is removed | Justin Clark-Casey (justincc) | 2011-08-10 | 1 | -8/+7 |
| * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -2/+2 |
| * | When using osTeleportAgent() and osTeleportAvatar(), only teleport if the reg... | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -4/+8 |
| * | Pass the first name and last name from the agent circuit data to the authoriz... | Justin Clark-Casey (justincc) | 2011-07-23 | 1 | -2/+3 |
| * | Generate the initial maptile asynchronously | Oren Hurvitz | 2011-07-22 | 1 | -11/+11 |
| * | refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consis... | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -2/+2 |
| * | Rename UpdatePrimRotation() to UpdatePrimGroupRotation() since this is what i... | Justin Clark-Casey (justincc) | 2011-07-19 | 1 | -4/+8 |
| * | When a mesh object is added to a scene, delay adding the physics actor until ... | Justin Clark-Casey (justincc) | 2011-07-12 | 1 | -2/+3 |
| * | When a sculpt/mesh texture is received by a part on a callback request, don't... | Justin Clark-Casey (justincc) | 2011-07-11 | 1 | -0/+1 |
* | | Add a timer to monitor the heartbeat. Restart it if it's been dead for | Melanie | 2011-07-25 | 1 | -2/+16 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -4/+4 |
|\ \
| |/ |
|
| * | fix build break I just introduced | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -2/+1 |
| * | Add an async inventory details sender to respond to FetchInventory packets. | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -2/+3 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-06-30 | 1 | -1/+3 |
|\ \
| |/ |
|