summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-04-06merge from viewer-trunkTofu Linden
2010-04-06merge from viewer-2-0Tofu Linden
2010-04-06merge from viewer-trunkTofu Linden
2010-04-06Resurrect 'Sun' menu options.Tofu Linden
These seem to have been clobbered by some bad XML merging that probably came in with 73f60e5518af / EXT-3531
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-06un-hairy merge from viewer-trunkTofu Linden
2010-04-06sigghhhh, yet more conflict resolution from the viewer-trunk merge. ↵Tofu Linden
actually builds now. let's see if it runs and works.
2010-04-06yet more conflict fixing from viewer-trunk mergeTofu Linden
2010-04-06another conflict fix from viewer-trunk mergeTofu Linden
2010-04-06automated mergeLoren Shih
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically Preliminary work to clean up naming conventions.
2010-04-06wtf-fix for using \\ instead of // as a comment.Tofu Linden
2010-04-06wtf-fix for using \\ instead of // as a comment.Tofu Linden
2010-04-06more fixing from the viewer-trunk mergeTofu Linden
2010-04-06some fixing from the viewer-trunk merge.Tofu Linden
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-06mergeTofu Linden
2010-04-05MergeEli Linden
2010-04-05ES fix unlocalized sidepanel titlesEli Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup for LLInventoryFunctions. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-02merge hotfix changes to releaseKent Quirk
2010-04-02EXT-6696 : Make Library inventory items somehow distinguishable at first ↵Loren Shih
glance from My Inventory items Library items are now set to Emphasis Color. This can be easily changed. Also fixed an issue where the "(Loading...)" string was overlapping with folder inventory strings.
2010-04-02EXT-6690 shorten PL translationEli Linden
2010-04-02mergeTofu Linden
2010-04-02Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is ↵Monroe Linden
questionable) * remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer. * replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive * don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in) Reviewed by Richard at http://codereview.lindenlab.com/1218007
2010-04-02VWR-17709 en_xui_change to accommodate the longest translation in PL even ↵Eli Linden
though this is a bug reported for ES; undo JA old override
2010-04-02EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'sLoren Shih
Fixed some more typedefs that I missed in first checkin.
2010-04-02automated mergeLoren Shih
2010-04-02automated mergeLoren Shih
2010-04-02mergeBrad Payne (Vir Linden)
2010-04-02mergeBrad Payne (Vir Linden)
2010-04-02Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-02add some debug code for EXT-5394: Crash in ↵Xiaohong Bao
LLViewerMediaImpl::calculateInterest()
2010-04-02automated mergeLoren Shih
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
Moved a bunch of local llinventorybridge functions into .cpp. Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
Moved a bunch of local llinventorybridge functions into .cpp. Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02ssreflection: restore the shadow factor I accidentally removed with the last ↵Tofu Linden
update.
2010-04-02apply ssreflection changes to class2 and class3 too.Tofu Linden
2010-04-02clean-up transplantTofu Linden
2010-04-02ssreflections: perspective reflection for sunlight, planar reflection for ↵Tofu Linden
ssreflection
2010-04-02ssreflections: water reflections strongly imply that the non-perspective ↵Tofu Linden
reflection from eye is the right one.
2010-04-02CleanupBrad Payne (Vir Linden)
2010-04-02ssreflections: use the minimum of the lighting dp and the appropriateness. ↵Tofu Linden
not the product.
2010-04-02ssreflections: reflect sunlight direction for reflection. dunno how I feel ↵Tofu Linden
about this yet.
2010-04-02merge fixTofu Linden
2010-04-02PE mergeTofu Linden
2010-04-02Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) ↵Eugene Mutavchi
- added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/ --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 01:37:32 +0000