Shyotl
|
008bebd817
|
Merge with siana/future
|
2011-10-13 00:03:56 -05: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
|
417f5084b4
|
Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places.
|
2011-09-03 19:30:42 -05:00 |
|
Siana Gearz
|
9d05a11ef0
|
Trivial build fixes for Linux
|
2011-08-18 21:17:32 +02:00 |
|
Siana Gearz
|
fd8866c411
|
Sione's Media Filter
|
2011-04-08 19:53:41 +02:00 |
|
Siana Gearz
|
c06db583a2
|
Henry's Media Fixes
|
2010-11-11 22:00:01 +01:00 |
|
Hazim Gazov
|
7a86d01598
|
Imported existing code
|
2010-04-02 02:48:44 -03:00 |
|