summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
AgeCommit message (Collapse)Author
2010-09-16MergeLeyla Farazha
2010-09-10Post-convert merge by convert_monolith.py from ↵Andrew Meadows
http://hg.lindenlab.com/brad/viewer-simconsole
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-01code for DEV-52939: viewer's object geometry cache files are not limited in ↵Xiaohong Bao
number, and can also be incorrectly cleared with the VFS cache. reviewed by andrew.
2010-08-25mergeDave Parks
2010-08-20Merge from dessie/viewer-releaseLeyla Farazha
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-04Merge with dessie/viewer-releaseLeyla Farazha
2010-08-04DEV-52379 FIXED (Supplementary) Viewer is not successfully caching object ↵Aimee Linden
geometry Encapsulated building of the cache filename into a help function to prevent code duplication. Reviewed by Tofu.
2010-07-30fix for DEV-52379 (viewer is not successfully caching object goemetry)Andrew Meadows
There was a typo between the files saved and those loaded. saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc Q will review later ;-)
2010-07-29Adding a simple region debug console.brad kittenbrink
2010-07-29Adding a simple region debug console.brad kittenbrink
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-07Merge with render-pipelineDave Parks
2010-06-03EXT-7630: FIXED: turn on http texture fetching by default.Xiaohong Bao
2010-05-24Ack. Fixed a bunch of stupid type mistakes in llvector4a.Matthew Breindel (Falcon)
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-04-26merge from viewer-trunkTofu Linden
2010-04-23Related to normal bug EXT-6302 (TP requests need to display destination ↵Eugene Mutavchi
region maturity) - added displaying maturity rating with an icon. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/229/. --HG-- branch : product-engine
2010-04-22DEV-47529 Turn off display names if no capability from simulator, andJames Cook
Display name update broadcasts entire new name record to nearby viewers Display name update directly inserts new name into sim cache indra.xml has display_names_enabled setting to control cap Synchronized viewer and server versions of avatar name cache Reviewed with Ambroff
2010-04-20Avatar picker requests are routed via sim capabilityJames Cook
2010-04-19DEV-47529 Viewer refresh name lookup cap URL on region cross/teleportJames Cook
Reviewed with Kelly
2010-04-16Accept expires timestamp as UTC datetime in LLSDJames Cook
2010-04-15DEV-47529 Viewer looks up display names via a sim capJames Cook
Squire asked me to route display name lookups via a simulator capability using HTTP GET. This buys us authentication until the data services team can implement a public-facing authenticating web service for People API.
2010-04-13Add SimulatorFeatures to the seed capabilities requested by the viewer.Matthew Breindel (Falcon)
2010-03-31viewer side support for coalesced objectsKarl Stiefvater (qarl)
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-23Part DEV-47695 route display name changes via sim for rebroadcast toJames Cook
nearby avatars for name tag updates and to update cached display name for LSL nonblocking functions
2010-03-02Can upload textures from model preview now.Dave Parks
Fix for bad region crossing.
2010-03-02Curl tweaks to get rid of various types of timeouts.Dave Parks
- Scrub host names from capability ips (requires disabling SSL host name verification) - Reset connections that have received a timeout (avoids cascading timeouts from reusing a cached bad connection)
2010-03-01Merge with viewer-2-0Dave Parks
2010-02-25EXT-5480: Support secondlife:///app/region SLapps.Lynx Linden
This is defined to work exactly like the classic secondlife://{REGION} Slurl. However, the later syntax cannot support spaces in the region name because spaces (and %20 chars) are illegal in the hostname of an http URL. Some browsers let you get away with this, but some do not (such as Qt's Webkit). Hence we have decided to introduce the newer secondlife:///app/region alternative.
2010-01-04Merge from trunk. Conflicts manually resolved in:Tofu Linden
U indra/llui/lluictrlfactory.cpp U indra/newview/llinventorybridge.cpp U indra/newview/llviewertexture.cpp U indra/newview/llviewertexture.h
2009-12-19Added a first view script limits floatergabriel
reviewed by Mani
2009-12-11HTTP Mesh fetch FTW.. still bustedDave Parks
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-03-20svn merge -r113004:115000 ↵Dave Simmons
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk
2009-03-13svn merge -r114093:114412 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 04:39:07 +0000