Commit Graph

33 Commits

Author SHA1 Message Date
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Siana Gearz
758c5bbfeb Stars for passwords are so 1993! 2011-04-01 05:14:02 +02:00
Shyotl
497e63bfb6 Fixed scaling issues with non-power-of-two ui textures 2011-03-31 21:53:23 -05:00
Shyotl
e756140e1d Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
Shyotl
de109f9f97 LLSD update. LLSD::insert no longer returns self. Use LLSD::with if return value is required. 2011-03-27 19:06:15 -05:00
Siana Gearz
179f4ddabb The Octopus Feature
___
                     .-'   `'.
                    /         \
                    |         ;
                    |         |           ___.--,
           _.._     |0) ~ (0) |    _.---'`__.-( (_.
    __.--'`_.. '.__.\    '--. \_.-' ,.--'`     `""`
   ( ,.--'`   ',__ /./;   ;, '.__.'`    __
   _`) )  .---.__.' / |   |\   \__..--""  """--.,_
  `---' .'.''-._.-'`_./  /\ '.  \ _.-~~~````~~~-._`-.__.'
        | |  .' _.-' |  |  \  \  '.               `~---`
         \ \/ .'     \  \   '. '-._)
          \/ /        \  \    `=.__`~-.
     jgs  / /\         `) )    / / `"".`\
    , _.-'.'\ \        / /    ( (     / /
     `--~`   ) )    .-'.'      '.'.  | (
            (/`    ( (`          ) )  '-;
             `      '-;         (-'
2011-03-24 23:54:23 +01:00
siana
472dade93a More build/package fixes 2011-03-19 00:14:20 +01:00
Siana Gearz
7b98e5f2f1 OpenSim crash fixes, thx to Henri and Zauber 2011-03-15 15:26:48 +01:00
Siana Gearz
dcb2e43329 Release 1.5.5 2011-03-05 16:04:52 +01:00
Shyotl
30b1bd7abb Sanity checks, bugfixes, crashfixes, and misc tweaks snagged from snowglobe. 2011-03-01 20:13:05 -06:00
Shyotl
6fb8f9bc96 Whoopsies! Fixed some broken ui logic from first llmath merge. 2011-02-23 02:54:00 -06:00
Shyotl
7deee9336c V2 llmath merge 2011-02-22 21:44:04 -06:00
Siana Gearz
d97f87b05f Grid currency, partial 2011-02-11 22:37:52 +01:00
Siana Gearz
6c37a5c514 This might just fix the double inventory thing 2011-01-13 02:56:31 +01:00
Siana Gearz
e89db0b4b1 HTTP links in group notices and extended group limit ready. 2011-01-04 14:48:23 +01:00
Siana Gearz
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +01:00
unknown
fe9a3d2ba2 Converted frequently occuring setting lookups to LLCachedControl
Added LLObjectList::getAvatar(LLUUID) for type-safe and quicker lookup
Added F32 overload to LLSD because using F64 needlessly is silly.
   (And its lack of F32 overload caused issues with LLCachedControl<F32>)
2010-10-07 21:36:13 -05:00
unknown
49e4959bf5 More vc2010 stuff (part deux) 2010-10-07 21:23:50 -05:00
unknown
2a584cb0fd Happy now, GCC? 2010-10-05 01:33:35 -05:00
Beeks
cd8a87eea4 Fixes for Gemini skin (As well as any future skin that uses a white-on-black theme).
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-28 17:40:06 -04:00
Beeks
b1bc45ac42 Right click menus for text entry areas that include copy/paste options.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-27 19:48:58 -04:00
Beeks
d49c92b6fe I got bored and put in the math functions from Imprudence.
We need something to show the list - Preferably a bit better than the popup that they use, I'm thinking maybe an expanding sidebar on the build menu?

Oh, minor changes - Texture repeats go up to 1000 now because it has numbers, and I tweaked the primitive params section so it doesn't fall off the window.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-16 22:08:33 -04:00
Hazim Gazov
ef4d705f64 Workaround for delayeddelete crash when closing 2010-09-02 22:49:29 -04:00
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00
Hazim Gazov
25fe391f07 added message logger / builder floaters 2010-05-05 17:08:05 -03:00
Hazim Gazov
4319caf5c9 added code for import, compensated for changes in the llapr library 2010-05-03 04:09:35 -03:00
Hazim Gazov
e13f747a05 more work done on copybootch function, save as xml works for the most part now 2010-05-01 10:24:24 -03:00
Hazim Gazov
fb28246485 It builds, now time to work on runtime bullcrap! 2010-04-23 08:31:39 -03:00
Hazim Gazov
c32adc2304 Fixed several compile errors with VS2005 2010-04-23 02:10:18 -03:00
Hazim Gazov
6185b0fb0c pushing what I have for tonight 2010-04-22 04:01:45 -03:00
Hazim Gazov
584e06208f more work on local inv 2010-04-21 16:13:08 -03:00
Hazim Gazov
772f12eb43 Added hex editor by day oh, ported it to snowglobe trunk 2010-04-03 06:07:25 -03:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00