| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -15/+35 |
* | | Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge | Melanie | 2011-10-12 | 1 | -6/+4 |
|\ \
| |/ |
|
| * | remove unused LastAssetID from DynamicTextureUpdaer | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -6/+4 |
| * | 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 |
* | | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge | Melanie | 2011-10-12 | 1 | -21/+4 |
|\ \
| |/ |
|
| * | Removed redundant scene presence lookups in HGMessageTransferModule | Dan Lake | 2011-10-05 | 1 | -21/+4 |
* | | Fix rezzing coalesced object broken by core merge | Melanie | 2011-10-12 | 1 | -54/+36 |
* | | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 2 | -399/+398 |
|\ \
| |/ |
|
| * | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... | Dan Lake | 2011-10-04 | 2 | -361/+375 |
* | | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 2 | -95/+73 |
|\ \
| |/ |
|
| * | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 2 | -95/+73 |
* | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+3 |
|\ \
| |/ |
|
| * | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 1 | -5/+4 |
* | | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmerge | Melanie | 2011-10-11 | 1 | -8/+5 |
|\ \
| |/ |
|
| * | minor: remove clutter null check from pass in config to AvatarFactoryModule.I... | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -8/+5 |
* | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 2 | -5/+54 |
|\ \
| |/ |
|
| * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... | Justin Clark-Casey (justincc) | 2011-09-30 | 2 | -4/+53 |
* | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+6 |
|\ \
| |/ |
|
| * | Added a setting to [Startup] section of config that will allow the simulator ... | Kevin Houlihan & Michelle Argus | 2011-09-24 | 1 | -3/+6 |
* | | Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+11 |
|\ \
| |/ |
|
| * | Don't try and resolve user account for authorization if the agent has come in... | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -1/+11 |
* | | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 4 | -102/+253 |
|\ \
| |/ |
|
| * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 4 | -86/+253 |
* | | Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge | Melanie | 2011-10-11 | 2 | -9/+18 |
|\ \
| |/ |
|
| * | Fix failure to teleport when an agent is lured on the same sim (and probably ... | Justin Clark-Casey (justincc) | 2011-09-22 | 2 | -9/+18 |
* | | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+3 |
|\ \
| |/ |
|
| * | On setting a new avatar appearance, if height hasn't changed then don't set t... | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -1/+3 |
* | | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | refactor: move estate owner setup code into separate method | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+2 |
* | | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -10/+14 |
|\ \
| |/ |
|
| * | Correctly create a freshly created estate owner's default items and avatar en... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -11/+15 |
* | | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Write code to create minimum necessary body parts/clothing and avatar entries... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -1/+1 |
* | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... | Justin Clark-Casey (justincc) | 2011-09-15 | 1 | -2/+2 |
* | | Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge | Melanie | 2011-10-11 | 2 | -12/+18 |
|\ \
| |/ |
|
| * | Shuffle order of code in invnetory connector GetFolderContent() calls to avoi... | Justin Clark-Casey (justincc) | 2011-09-15 | 2 | -12/+18 |
* | | Fix a rather stupid VS warning "The operation overflows at compile time in ch... | Tom | 2011-09-14 | 1 | -3/+3 |
* | | Bring us up to date. | Tom | 2011-09-14 | 15 | -332/+613 |
|\ \
| |/ |
|
| * | Don't try and delete attachments for child agent close | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -0/+32 |
| * | Remove code from DetachSingleAttachmentToInv() that sets group changed on all... | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -11/+0 |
| * | remove redunant itemID and agentID arguments from UpdateKnownItem(). | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -6/+4 |
| * | Remove UpdateKnownItem() from IAttachmentsModule. | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -1/+1 |
| * | minor: remove redundant grp != null check from AM.UpdateKnownItem() | Justin Clark-Casey (justincc) | 2011-09-13 | 1 | -36/+33 |