Merge branch 'next' of git://github.com/imprudence/imprudence into next

Removed the new "Set your own Imprudence tag colour feature".  Should check though, might be bits left that where not obvious.

Conflicts:
	.gitignore
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerinfo.cpp

The usual branding conflicts.

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/llcommon/llrand.h b/linden/indra/llcommon/llrand.h
index 73ea179..0b68a17 100644
--- a/linden/indra/llcommon/llrand.h
+++ b/linden/indra/llcommon/llrand.h
@@ -83,6 +83,11 @@ LL_COMMON_API F32 ll_frand();
 LL_COMMON_API F32 ll_frand(F32 val);
 
 /**
+ *@brief Generate a float from [min, max].
+ */
+LL_COMMON_API F32 ll_frand(F32 min, F32 max);
+
+/**
  *@brief Generate a double from [0, 1.0).
  */
 LL_COMMON_API F64 ll_drand();