Shyotl
|
b887d3147e
|
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
Conflicts:
indra/llrender/llglstates.h
|
2011-03-25 17:54:52 -05:00 |
|
Shyotl
|
459deb4288
|
Media stream cleared when entering parcel with invalid media url
|
2011-03-25 17:51:18 -05:00 |
|
Shyotl
|
f73c666f0e
|
Added isAgentAvatarValid() helper function from v2
Nullchecks
Flight-state tweaks
|
2011-03-25 17:50:06 -05:00 |
|
Siana Gearz
|
86f7987e13
|
build fix, cleanup
|
2011-03-25 22:09:42 +01:00 |
|
Siana Gearz
|
82667f5618
|
Merge git://github.com/Shyotl/SingularityViewer
|
2011-03-25 03:41:11 +01:00 |
|
Siana Gearz
|
179f4ddabb
|
The Octopus Feature
___
.-' `'.
/ \
| ;
| | ___.--,
_.._ |0) ~ (0) | _.---'`__.-( (_.
__.--'`_.. '.__.\ '--. \_.-' ,.--'` `""`
( ,.--'` ',__ /./; ;, '.__.'` __
_`) ) .---.__.' / | |\ \__..--"" """--.,_
`---' .'.''-._.-'`_./ /\ '. \ _.-~~~````~~~-._`-.__.'
| | .' _.-' | | \ \ '. `~---`
\ \/ .' \ \ '. '-._)
\/ / \ \ `=.__`~-.
jgs / /\ `) ) / / `"".`\
, _.-'.'\ \ / / ( ( / /
`--~` ) ) .-'.' '.'. | (
(/` ( (` ) ) '-;
` '-; (-'
|
2011-03-24 23:54:23 +01:00 |
|
Shyotl
|
39af56c6f7
|
Object list now using standard stl container classes instead of deprecated LL clones.
|
2011-03-24 05:09:34 -05:00 |
|
Shyotl
|
0150bac422
|
LLGLState::sStateMap now using hash map (boost::unordered_map) opposed to std::map
|
2011-03-24 05:03:21 -05:00 |
|
Shyotl
|
23e1521a6b
|
Some assertions, just in case.
|
2011-03-24 05:00:46 -05:00 |
|
Shyotl
|
e4df5c7fd0
|
Resolved some minor leaks
|
2011-03-24 04:56:54 -05:00 |
|
siana
|
d4b6ece24b
|
Unbotch jsoncpp
|
2011-03-21 04:17:00 +01:00 |
|
siana
|
67915fe8c8
|
That's why tags wouldn't show initially
|
2011-03-21 03:43:47 +01:00 |
|
siana
|
611b8f48d6
|
VC10 fixes
|
2011-03-21 03:13:49 +01:00 |
|
siana
|
15c01ed310
|
Merge remote branch 'shyotl/V2Renderer'
Conflicts:
indra/cmake/00-Common.cmake
|
2011-03-20 04:55:56 +01:00 |
|
siana
|
baac16b5d2
|
OpenJPEG experiment, PCH circumcision
|
2011-03-20 04:44:58 +01:00 |
|
siana
|
e70a91311f
|
don't botch Python syntax so badly
|
2011-03-19 14:17:37 +01:00 |
|
siana
|
472dade93a
|
More build/package fixes
|
2011-03-19 00:14:20 +01:00 |
|
siana
|
3b567d3eae
|
VC10 transition, Webkit 4.7.1
|
2011-03-18 01:33:47 +01:00 |
|
Shyotl
|
77b5ac28e6
|
Oh cmake. You so silly. VS2010 wchar_t fix
|
2011-03-17 00:37:18 -05:00 |
|
Siana Gearz
|
919d321d4a
|
MultiAttach only on SL
|
2011-03-16 13:44:12 +01:00 |
|
Siana Gearz
|
689337eb8c
|
Merge remote branch 'origin/unimap2'
|
2011-03-16 01:40:29 +01:00 |
|
Siana Gearz
|
51a71f27e9
|
Fix avatar display, ocean colour
|
2011-03-16 01:34:49 +01:00 |
|
Shyotl
|
40c0a8d210
|
Renderer tweaks
|
2011-03-15 17:45:26 -05:00 |
|
Shyotl
|
bdd4f911e9
|
Nullcheck
|
2011-03-15 17:44:22 -05:00 |
|
Siana Gearz
|
ee60606a04
|
Don't use C allocation in LLImage
because LLTextureCache/LLTextureFetch feed it new[]ed data!
|
2011-03-15 23:26:24 +01:00 |
|
Siana Gearz
|
34fe62ba53
|
Need not this any longer, it's all in git
|
2011-03-15 16:33:09 +01:00 |
|
Siana Gearz
|
5882ea5643
|
Better RelWithDebInfo flags on Linux
|
2011-03-15 16:24:11 +01:00 |
|
Siana Gearz
|
7b98e5f2f1
|
OpenSim crash fixes, thx to Henri and Zauber
|
2011-03-15 15:26:48 +01:00 |
|
Shyotl
|
387e8ed756
|
JointMesh face update optimization
|
2011-03-15 05:13:06 -05:00 |
|
Shyotl
|
1c33889762
|
Merge branch 'master' into V2Renderer
|
2011-03-15 03:15:56 -05:00 |
|
Shyotl
|
0eab7bd2a5
|
Merge branch 'master' of git://github.com/siana/SingularityViewer.git
|
2011-03-15 02:36:25 -05:00 |
|
Shyotl
|
ef4c050e35
|
Added reload button to web-based search and showcase, since a page failing to load shouldn't require a client restart in order to try it again.
|
2011-03-15 02:34:27 -05:00 |
|
Shyotl
|
62d7f3d59f
|
Misc llcommon tidbits from v2.
|
2011-03-15 02:33:55 -05:00 |
|
Shyotl
|
6ee243d0d5
|
Added reload button to web-based search and showcase, since a page failing to load shouldn't require a client restart in order to try it again.
|
2011-03-15 02:32:14 -05:00 |
|
Shyotl
|
e29d969631
|
Misc llcommon tidbits from v2.
|
2011-03-15 02:28:22 -05:00 |
|
Shyotl
|
b06dcb45c0
|
Applying recent commits from Snowstorm
|
2011-03-15 01:15:43 -05:00 |
|
Shyotl
|
a8ef46888e
|
More STORM-1026 LL fixes.
|
2011-03-14 17:03:34 -05:00 |
|
Shyotl
|
343bb22b5c
|
Fixed a snapshot crash
|
2011-03-14 16:30:09 -05:00 |
|
Shyotl
|
81174cffa7
|
Fixed a snapshot crash
|
2011-03-14 16:26:47 -05:00 |
|
Siana Gearz
|
d27e5a2676
|
Inventory crashfix
|
2011-03-14 15:44:58 +01:00 |
|
Siana Gearz
|
f67c761341
|
Performance fix, maturity
|
2011-03-14 00:12:02 +01:00 |
|
Siana Gearz
|
e63279a692
|
Amazon world map
|
2011-03-13 02:52:56 +01:00 |
|
Siana Gearz
|
a05fdaa63e
|
Unbotched that
|
2011-03-12 22:14:54 +01:00 |
|
Siana Gearz
|
ed457e3539
|
killing terrain tab
|
2011-03-11 17:50:56 +01:00 |
|
Siana Gearz
|
fc1fc600d9
|
Map refactor
|
2011-03-11 17:50:56 +01:00 |
|
Siana Gearz
|
68fa3ae13c
|
HUDs should automatically reposition now
|
2011-03-11 17:10:55 +01:00 |
|
Siana Gearz
|
19f9af6c29
|
Bulldozer Teleport History from Henri's
|
2011-03-11 15:45:59 +01:00 |
|
Shyotl
|
564f7067f7
|
Browser window less likely to display garbage when resized. (Initialized gl texture to black)
Could improve even further by padding area around copied plugin texture with black. Doesn't seem too necessary tho.
|
2011-03-10 23:19:14 -06:00 |
|
Shyotl
|
862ce4807c
|
V2 walk/run animations
|
2011-03-10 23:18:22 -06:00 |
|
Shyotl
|
ef90cc74e4
|
Whoops. Reverting some stuff I was toying around with.
|
2011-03-10 23:13:00 -06:00 |
|