summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-13SH-4035: Removed prompt to save if av just has outfit changes and you click ↵prep@lindenlab.com
on the back button
2013-05-13CHOP-942: fix crash if update check times outOz Linden
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more ↵Graham Madarasz
consistent and increased max range on repeats per meter
2013-05-13NORSPEC-173 Fix for mac buildDave Parks
2013-05-13NORSPEC-171 Fix for full bright checkbox breaking transparent objects with ↵Dave Parks
materials set.
2013-05-13mergeprep@lindenlab.com
2013-05-13SH-4035: Hooked up logic to handle 'me->appearance'. Refactored out some ↵prep@lindenlab.com
commonly used code in llfloatersidepanelcontainer
2013-05-13Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-13mergeBrad Payne (Vir Linden)
2013-05-13CHUI-944 FIXED Show Voice indicator for P2P torn off conversations.Mnikolenko ProductEngine
2013-05-12LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::nullKitty Barnett
2013-05-12Avoid code duplication in LLMaterialMgrKitty Barnett
2013-05-12Refactor LLPanelFace to make it clearer that the material is a property of ↵Kitty Barnett
the face(s) and never the panel
2013-05-12Merged with viewer-dev-materialsKitty Barnett
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
2013-05-11Fix many issues with selection misapplication and rendering not matching ↵Graham Madarasz
applied materials
2013-05-11increment version to 3.5.3Oz Linden
2013-05-11merge latest integration repo changesOz Linden
2013-05-11Merge vwr-dev-matGraham Madarasz
2013-05-11Updating appearance utilityDon Kjer
2013-05-11Updating appearance utilityDon Kjer
2013-05-10Pull merge from viewer-fbcMerov Linden
2013-05-10ACME-348 : Completed : Facebook Connect refactored, LLPeoplePanel test list ↵Merov Linden
hooked correctly.
2013-05-10Add BuildVersion.cmake to great chain of lifeGraham Madarasz
2013-05-10NORSPEC-132 Fix for Rotation degree has range -9999.00..9999.00callum_linden
2013-05-10Put back normal map and spec map initializers/destruction, delete FMOD refs ↵Graham Madarasz
(unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10ACME-348 : WIP : Add some traces to work out the protocol (temporary)Merov Linden
2013-05-10NORSPEC-173 Shrink size of matrix palette for backwards compatibility.Dave Parks
2013-05-10MAINT-2672 Make windows flex/bison inputs identical to other platforms to ↵Graham Madarasz
make bison >= 2.7 work
2013-05-10mergeprep@lindenlab.com
2013-05-10SH-4035: Removed prompt to save if av just has outfit changes. Hooked up ↵prep@lindenlab.com
logic to handle ctrl+w and ctrl+shift+w confirmation prompts
2013-05-10merge changes for 3.5.2-beta5Oz Linden
2013-05-10Added tag 3.5.2-beta5 for changeset 895628bb5e16Oz Linden
2013-05-10Merge with vwr-dev-matGraham Madarasz
2013-05-10BUILDFIX capitalization errorNyx Linden
2013-05-10mergeNyx Linden
2013-05-10DEBUG adding additional logging for avatar heightNyx Linden
usually disabled, enable avatar in logcontrol.xml to get output.
2013-05-10merge changes for MAINT-2647Oz Linden
2013-05-10tag merge of MAINT-2647Oz Linden
2013-05-10Remove some unreachable codeDave Parks
2013-05-10fix merge error in 3.5.2 mergeOz Linden
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-10merge changes for latest project changesOz Linden
2013-05-10SH-4176 WIP - allow retries on 4xx errors if enabled by flag. So enable in ↵Brad Payne (Vir Linden)
the case of appearance requests.
2013-05-10SH-4176 WIP - avoid raw dump of whole error contents in log fileBrad Payne (Vir Linden)
2013-05-10SH-4176 WIP - tweaks to debugCOF(), which shows differences between viewer ↵Brad Payne (Vir Linden)
and server side views of the COF when a mismatch occurs
2013-05-10NORSPEC-102 Rapid materials updates are not smooth to viewer which is ↵Kitty Barnett
editing the object
2013-05-09ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB ↵Gilbert Gonzales
icon, and FB name: Found a couple bugs that were causing the positioning of text to be incorrect in the 'Peope you may want to friend' tab.
2013-05-09ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB ↵Gilbert Gonzales
icon, and FB name: Rendering now matches the UX spec.