V3 merge pt 2 / 2

This commit is contained in:
Shyotl
2012-04-13 23:24:39 -05:00
parent e1d243272f
commit 59fdf3b6e1
6 changed files with 169 additions and 39 deletions

View File

@@ -134,7 +134,7 @@ public:
virtual EStepType getType() = 0;
// Return a user-readable label for this step
virtual std::string getLabel() const = 0;
virtual std::vector<std::string> getLabel() const = 0;
virtual S32 getMaxSerialSize() const = 0;
virtual BOOL serialize(LLDataPacker& dp) const = 0;
@@ -156,7 +156,7 @@ public:
virtual EStepType getType() { return STEP_ANIMATION; }
virtual std::string getLabel() const;
virtual std::vector<std::string> getLabel() const;
virtual S32 getMaxSerialSize() const;
virtual BOOL serialize(LLDataPacker& dp) const;
@@ -179,7 +179,7 @@ public:
virtual EStepType getType() { return STEP_SOUND; }
virtual std::string getLabel() const;
virtual std::vector<std::string> getLabel() const;
virtual S32 getMaxSerialSize() const;
virtual BOOL serialize(LLDataPacker& dp) const;
@@ -202,7 +202,7 @@ public:
virtual EStepType getType() { return STEP_CHAT; }
virtual std::string getLabel() const;
virtual std::vector<std::string> getLabel() const;
virtual S32 getMaxSerialSize() const;
virtual BOOL serialize(LLDataPacker& dp) const;
@@ -227,7 +227,7 @@ public:
virtual EStepType getType() { return STEP_WAIT; }
virtual std::string getLabel() const;
virtual std::vector<std::string> getLabel() const;
virtual S32 getMaxSerialSize() const;
virtual BOOL serialize(LLDataPacker& dp) const;