summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfixedbuffer.h
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2025-12-23 03:51:39 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2025-12-23 03:51:39 +0200
commit259d28cd788cb6150cffde8f11cde2887c2e3bcb (patch)
tree5969f6504786c0752c805bc833d6aef513a8387f /indra/llcommon/llfixedbuffer.h
parent0c8794ef0f7985c9204551d2c6ed315ffa6ee505 (diff)
parent3ff35b8c2b530bc7d4e6fbdeb688506b27af2d66 (diff)
Merge branch 'develop-linux' into marchcat/slua-linux
Diffstat (limited to 'indra/llcommon/llfixedbuffer.h')
-rw-r--r--indra/llcommon/llfixedbuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llfixedbuffer.h b/indra/llcommon/llfixedbuffer.h
index 1234d2014f..d2cd660c18 100644
--- a/indra/llcommon/llfixedbuffer.h
+++ b/indra/llcommon/llfixedbuffer.h
@@ -27,7 +27,7 @@
#ifndef LL_LLFIXEDBUFFER_H
#define LL_LLFIXEDBUFFER_H
-#include "timer.h"
+#include "lltimer.h"
#include <deque>
#include <string>
#include "llstring.h"