diff options
author | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-15 21:50:42 +0000 |
---|---|---|
committer | Roxanne Skelly <roxie@lindenlab.com> | 2009-07-15 21:50:42 +0000 |
commit | ff52ac089f9ed67410f80fe66d0b997f0f2dafcc (patch) | |
tree | bc0f195c198ddf3d6d338e48f79e419c246f03fa /indra/newview/llurl.h | |
parent | ff51d31af3d3c28e474c2831b38bbefa6f7732c5 (diff) |
DEV-34822 viewer 1.23 merge
DEV-32649 Merge the diamondware/vivox voice code
-r124876
-r125220
Diffstat (limited to 'indra/newview/llurl.h')
-rw-r--r-- | indra/newview/llurl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llurl.h b/indra/newview/llurl.h index 9a089dd835..e41b83d29f 100644 --- a/indra/newview/llurl.h +++ b/indra/newview/llurl.h @@ -79,6 +79,7 @@ public: virtual const char *getFQURL() const; virtual const char *getFullPath(); + virtual const char *getAuthority(); virtual const char *updateRelativePath(const LLURL &url); |