Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -0/+3 |
|\ | |||||
| * | Prevent dropping someone else's attachments | Melanie | 2010-09-30 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Quash the region ID on intersim messages. That prevents people from determining | Melanie | 2010-09-27 | 1 | -1/+1 |
| | | | | | | | | another avatars location | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-26 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | When receiving intersim IM, don't let the spoof protection bomb | Melanie | 2010-09-26 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Prevent spoofing the agent name on text IM | Melanie | 2010-09-25 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 1 | -3/+1 |
|\ \ | |/ | |||||
| * | Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -3/+1 |
| | | | | | | | | This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -7/+3 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 2 | -33/+83 |
| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -7/+3 |
| | | | | | | | | MapAndArray collection | ||||
* | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 2 | -33/+83 |
| | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
* | | Catch a nullref | root | 2010-09-16 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 3 | -18/+24 |
|\ \ | |/ | |||||
| * | Rename now protected method SetAttachmentInventoryStatus() to ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+4 |
| | | | | | | | | ShowAttachInUserInventory() to match ShowDetachInUserInventory() | ||||
| * | Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -5/+13 |
| | | | | | | | | No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately | ||||
| * | If attachment fails (e.g. because asset wasn't found) then don't try to set ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+2 |
| | | | | | | | | | | | | attachment as shown in inventory Doing this results in a null reference exception | ||||
| * | minor: Clean up log messages generated when an item is attached | Justin Clark-Casey (justincc) | 2010-09-13 | 2 | -3/+5 |
| | | |||||
| * | * Fixing length calculations for HTTP texture downloads (the end byte is ↵ | John Hurliman | 2010-09-13 | 1 | -4/+6 |
| | | | | | | | | inclusive in Range: headers) | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 10 | -315/+274 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 9 | -74/+74 |
| | | |||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 1 | -1/+1 |
| | | |||||
| * | Over a dozen thread safety fixes in FriendsModule | John Hurliman | 2010-09-09 | 1 | -167/+163 |
| | | |||||
| * | * Changed 11 calls for session info to the more optimized API method | John Hurliman | 2010-09-08 | 2 | -71/+33 |
| | | |||||
| * | Fix yet another cause of "Ghost attachments" | Melanie Thielker | 2010-09-06 | 1 | -3/+12 |
| | | |||||
* | | Fix yet another cause of "Ghost attachments" | Melanie Thielker | 2010-09-06 | 1 | -3/+12 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 3 | -6/+5 |
|\ \ | |/ | |||||
| * | Move code that allows llGiveInvetory() to move item into appropriate system ↵ | Justin Clark-Casey (justincc) | 2010-09-04 | 1 | -2/+1 |
| | | | | | | | | | | | | | | folder up from connectors into Scene.Inventory.cs This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway. | ||||
| * | Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item) | Justin Clark-Casey (justincc) | 2010-09-04 | 1 | -3/+3 |
| | | | | | | | | The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated. | ||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-09-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -16/+79 |
|\ \ | |/ | |||||
| * | refactor: move SOG.AttachToAgent() into AttachmentsModule | Justin Clark-Casey (justincc) | 2010-09-01 | 1 | -7/+74 |
| | | |||||
| * | refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments ↵ | Justin Clark-Casey (justincc) | 2010-08-31 | 1 | -9/+5 |
| | | | | | | | | rather than filter sp.Attachments list directly | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 5 | -53/+178 |
|\ \ | |/ | |||||
| * | very minor log message and var name tweaking for iar saving | Justin Clark-Casey (justincc) | 2010-08-28 | 2 | -5/+8 |
| | | |||||
| * | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -1/+1 |
| | | |||||
| * | minor: reduce log chattiness of "load iar" for IARs with lots of folders | Justin Clark-Casey (justincc) | 2010-08-27 | 1 | -1/+1 |
| | | |||||
| * | allow inventory path specified in "load iar" to start with a / (e.g. ↵ | Justin Clark-Casey (justincc) | 2010-08-27 | 2 | -1/+33 |
| | | | | | | | | /Objects is now valid where it wasn't before) | ||||
| * | refactor: Make IAR tests set up standard iar for loading | Justin Clark-Casey (justincc) | 2010-08-27 | 1 | -44/+60 |
| | | |||||
| * | refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -2/+58 |
| | | | | | | | | since this appears to relate solely to attachments | ||||
| * | refactor: break out attachment position change code in ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+20 |
| | | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions. | ||||
| * | minor: change log message from info to debug | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 1 | -1/+1 |
|\ \ | |/ | | | | | This was rather conflicted. Please test linking. | ||||
| * | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+1 |
| | | | | | | | | conditions in linking and unlinking | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-23 | 3 | -11/+5 |
|\ \ | |/ | |||||
| * | Remove various warnings and improve logging messages. No functional changes. | Justin Clark-Casey (justincc) | 2010-08-23 | 3 | -18/+17 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -223/+242 |
|\ \ | |/ | |||||
| * | Some code cleanup for console command alert. | Marck | 2010-08-20 | 1 | -9/+43 |
| | | | | | | | | | | | | Made parsing of parameters more robust. Allow general alerts without specifying keyword 'general'. Extended help texts. |