Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 3 | -0/+480 |
|\ | |||||
| * | A couple of more ways attachment point is sent | Latif Khalifa | 2010-10-15 | 1 | -0/+8 |
| | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -3/+7 |
| |\ | |||||
| | * | Don't distroy attachments when using viewer 2.1+, strip multiple attachment data | Latif Khalifa | 2010-10-14 | 1 | -0/+4 |
| | | | |||||
| | * | Kill some magic numbers in the mesh upload module and change the mesh asset | Melanie | 2010-10-14 | 1 | -3/+3 |
| | | | | | | | | | | | | type from 45 to 49 to match OMV trunk | ||||
| * | | * Replacing Magic numbers with Enums | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -4/+4 |
| |/ | |||||
| * | * A few additional cleanup elements | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+6 |
| | | | | | | | | | | * At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong. * Special thanks to John Hurliman and Latif Khalifa for their valuable insight. | ||||
| * | * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST' | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+1 |
| | | | | | | | | * At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that. | ||||
| * | * Tweaked the upload response and now at least uploading the mesh works. | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -16/+21 |
| | | | | | | | | * Binary error on downloading the mesh though.. so still not yet working. | ||||
| * | Rename file + more testing and tweaking | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -9/+17 |
| | | |||||
| * | * Partially complete stuff for Mesh support that Melanie wanted to see ↵ | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+449 |
| | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either. | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-10-10 | 1 | -0/+1 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Add group invites to the list of messages that get offlined | Melanie | 2010-10-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-10 | 1 | -2/+10 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fix a typo in previouis commit: start must not pass the end of the file | Latif Khalifa | 2010-10-09 | 1 | -2/+2 |
| | | |||||
| * | weird line endings fix commit | Teravus Ovares (Dan Olivares) | 2010-10-09 | 1 | -7/+7 |
| | | |||||
| * | Return error code instead of the last byte of the file if range is not ↵ | Latif Khalifa | 2010-10-09 | 1 | -1/+9 |
| | | | | | | | | satisfiable | ||||
| * | In case when 1 single byte is requested (yes viewer does this) | Latif Khalifa | 2010-10-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | start of the ranges gets clamped with a wrong value. In case of a texture with 601 byte long texture the viewer request range 0-599 first, then 600- in which case both start and end should be 600. End can also be 0, valid request for the firt byte of the file is 0-0. Thanks to Thickbrick for explaining how HTTP range header works. | ||||
* | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 1 | -1/+1 |
| | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 2 | -7/+7 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 2 | -7/+7 |
| | | |||||
* | | 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 |
|\ \ | |/ |