Melanie 6becaf65e1 Fix merge issues

2011-02-07 22:28:59 +00:00

..

Assets

Comment out texture CAPS 'texture not found' message for now

2011-02-02 20:02:10 +00:00

Attachments

Merge branch 'master' into careminster-presence-refactor

2011-01-27 05:18:28 +00:00

AvatarFactory

Removed a few more spurious appearance saves. When an avatar

2011-01-25 14:23:58 -08:00

Chat

Merge branch 'master' into careminster-presence-refactor

2010-10-27 20:49:27 +01:00

Combat

Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.

2010-11-21 13:16:52 -08:00

Dialog

Merge branch 'master' into careminster-presence-refactor

2010-08-21 00:32:26 +01:00

Friends

Allow cross-scope friendships to work, and also allow other cross scope name

2011-01-03 19:42:46 +00:00

Gestures

Fix build break

2011-01-18 01:48:37 +00:00

Gods

Implement nonlocal god kicks and freezes

2011-01-14 03:35:45 +01:00

Groups

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

InstantMessage

Merge branch 'master' into careminster-presence-refactor

2011-01-23 23:29:25 +00:00

Inventory

Fix merge issues

2011-02-07 22:28:59 +00:00

Lure

Change inworld restart to use blue boxes rather than notices to match SL

2010-11-29 21:45:03 +01:00

NPC

…

ObjectCaps

remove some mono compiler warnings

2011-01-21 23:19:52 +00:00