summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.h
AgeCommit message (Expand)Author
2010-01-04EXT-3840 Default map position is back to 128, 128, 0, removed deadJames Cook
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-10-07EXT-1339 Create onClose method in LLFloater, and remove most bindings to mClo...James Cook
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ...James Cook
2009-07-09Cleaned up LLFloaterWorldMap a little to track down a crash... which appears ...Steven Bennetts
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 1Steven Bennetts
2008-03-04svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/...Don Kjer
2007-11-01svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-s...Josh Bell
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-07-26EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-01-02Print done when done.James Cook