| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2010-04-19 | CR Changes from Aimee | Roxie Linden | |
| 2010-04-14 | DEV-48904 - p2p acceptance dialog vanishes too quickly | Roxie Linden | |
| DEV-48903 - malformed names in p2p dialogs for Diamondware In the merge there were some changes that didn't get propagated that resulted in some failures with respect to diamondware name processing. THe determination as to whether a p2p session was with an avatar or with an alcatel (pbx) wasn't propagated into the diamondware code. I fixed that by merging the changes to the vivox module with respect to that into the diamondware module. Also, the acceptance dialog was vanishing too quickly as the determination as to whether there was still a p2p invite pending was not updated when the calling code was updated. The calling code initially was changed to look into vivox state which isn't really valid. that was changed in the 'trunk' to another mechanism, but that still assumed visibility into the voice code. I fixed that by creating an API call to ask whether a call was pending. CR: Karina | |||
| 2010-04-19 | automated merge with trunk | Roxie Linden | |
| 2010-04-07 | Re-insert backed out SLE checkin so we can fix it | Roxie Linden | |
| 2010-04-07 | Backed out changeset 63b699f90efd | Tofu Linden | |
| 2010-04-01 | Automated Merge | Roxie Linden | |
| 2010-03-29 | Automated merge | Roxie Linden | |
| 2010-03-02 | Windows launching changes for vivox and diamondware voice did not get ↵ | Roxie Linden | |
| properly merged. | |||
| 2010-03-01 | Automated merge from trunk | Roxie Linden | |
| 2010-03-01 | Automated merge with a few fixups for code review comments | Roxie Linden | |
| 2010-02-26 | automated merge | Roxie Linden | |
| 2010-02-26 | automated merge | Roxie Linden | |
| 2010-02-26 | automated merge | Roxie Linden | |
| 2010-02-26 | automated merge | Roxie Linden | |
| 2010-02-25 | automated merge | Roxie Linden | |
| 2010-02-25 | automated merge from trunk | Roxie Linden | |
| 2010-02-25 | warn-on-failure:unix-eol | Roxie Linden | |
| automated merge from trunk | |||
| 2010-02-25 | automated merge from trunk | Roxie Linden | |
| 2010-02-25 | automated merge from trunk | Roxie Linden | |
| 2010-02-25 | automated merge | Roxie Linden | |
| 2010-02-24 | automated merge | Roxie Linden | |
| Don't wanna fix all windows EOL issue here warn-on-failure:unix-eol | |||
| 2010-02-24 | Automated merge up from viewer 2.0 trunk. | Roxie Linden | |
| Some llvoiceclient changes duplicated changes that had already been made in the voice modularization refactor, so the refactor versions were used. | |||
| 2009-07-15 | DEV-34822 viewer 1.23 merge | Roxanne Skelly | |
| DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220 | |||
 |
index : viewer.git | |
| Megapahit's fork of the Second Life viewer. | Erik Kundiman |
| summaryrefslogtreecommitdiff |