Lirusaito
37d2e41618
Spelling fix.
...
appearance isn't spelled appearence
2012-04-25 05:00:02 -04:00
Siana Gearz
f05edda4f4
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloatermessagelog.cpp
indra/newview/llstartup.cpp
indra/newview/llviewermenu.cpp
indra/newview/llviewermessage.cpp
indra/newview/skins/default/xui/fr/menu_inventory.xml
2012-03-28 22:27:45 +02:00
Siana Gearz
251b0fa5c0
Memory consumption in statistics floater
2012-03-01 13:49:47 +01:00
Shyotl
a6a69caa4f
Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear
...
Conflicts:
indra/newview/llfloateravatarlist.cpp
indra/newview/llfloateropenobject.cpp
indra/newview/llinventorybridge.cpp
indra/newview/llviewerinventory.cpp
2012-02-24 13:21:59 -06:00
Siana Gearz
10af9d64f2
One day this will be a memory stat
2012-02-24 03:26:06 +01:00
Shyotl
ae7b12f230
Interim commit before diving into reworking the inventory panel.
2012-02-16 19:25:59 -06:00
Shyotl
6374f012de
new fasttimers, including ui.
2012-01-23 18:30:54 -06:00
Shyotl
36600462d1
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing
...
Conflicts:
indra/newview/hippopanelgrids.cpp
indra/newview/llstartup.cpp
indra/newview/llsurface.cpp
indra/newview/llviewermessage.cpp
indra/newview/llviewerparceloverlay.cpp
indra/newview/llviewertexturelist.cpp
indra/newview/llworld.cpp
2011-09-09 16:53:12 -05:00
Shyotl
7e9f8c7bf8
Several LLStat variables migrated into the LLViewerStats class.
2011-08-28 00:56:57 -05:00
Aleric Inglewood
3bde58d970
Wrap sGlobalRawMemory in AIThreadSafe.
...
This is accessed by different threads.
Other globals like it might also be
accessed by different threads, this has
to be investigated.
2011-08-18 19:32:45 +02:00
Shyotl
a237cb9cad
llmemory.h cleanup. pulled llpointer, refcounter, smartpointer, singleton and safe handle out into their own headers. llmemory.h drags all those headers in for legacy support until everything else is cleaned up. getCurrentRSS() moved into LLMemory. getWorkingSetSize() added to LLMemory.
2011-07-29 20:40:08 -05:00
Siana Gearz
04e41002c5
Fixed a couple of shameful things, thanks to Fractured for pointing out
2011-06-21 01:11:14 +02:00
Shyotl
a07e399801
LLAgentCamera transition (1/2)
2011-06-07 21:35:10 -05:00
Shyotl
d1d6994419
Full v2.6 renderer.
2011-05-12 00:13:38 -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
Siana Gearz
d68736da39
Put in some changes along sg1.4 dev history.
2010-11-21 15:57:44 +01:00
Beeks
2faa13a37b
Collection of minor edits from Imprudence to fix bugs, etcetera. Also updated the version.
...
Also made the version almost entirely hard-coded to remove any remnants of Inertia's spoofer.
Signed-off-by: Beeks <HgDelirium@gmail.com >
2010-09-21 14:49:46 -04:00
Hazim Gazov
e204d77d52
added some settings from SLPE
2010-04-23 09:34:47 -03:00
Hazim Gazov
7a86d01598
Imported existing code
2010-04-02 02:48:44 -03:00
