aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-233-11/+5
|\
| * Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-233-18/+17
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-211-223/+242
|\ \ | |/
| * Some code cleanup for console command alert.Marck2010-08-201-9/+43
| | | | | | | | | | | | Made parsing of parameters more robust. Allow general alerts without specifying keyword 'general'. Extended help texts.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-182-10/+11
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-131-3/+3
| |
| * refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵Justin Clark-Casey (justincc)2010-08-131-7/+8
| | | | | | | | same name
* | Fix the general alert message so it doesn't get sent to child agentsmeta72010-08-071-220/+223
| |
* | and another one...sacha2010-08-071-1/+1
| |
* | Clean the loo after use please !!!!!sacha2010-08-071-4/+4
| | | | | | | | | | No need to keep useless debug message ! Never heard of wasted cpucycle you darn kid !
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-071-1/+1
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-071-1/+1
| |\
| | * Remove old test classes that don't actually test anything not done elsewhereJustin Clark-Casey (justincc)2010-08-071-1/+1
| | | | | | | | | | | | Also comment out log4net line in InventoryArchiverTests
| * | Change the (hackish) constant to match the changed enum for attachsMelanie Thielker2010-08-071-2/+2
| |/
* | Change the (hackish) constant to match the changed enum for attachsMelanie Thielker2010-08-071-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-063-80/+134
|\ \ | |/
| * Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-043-80/+134
| |\ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
| | * Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-303-83/+137
| | | | | | | | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour
| * | Clean up some messiness in IM sending. Having offline IM enabled now no longerMelanie Thielker2010-08-042-6/+10
| | | | | | | | | | | | suppresses "Inventory Saved" messages.
* | | Cost Reduction : Removing verbose message....sacha2010-08-041-1/+1
| | |
* | | Clean up some messiness in IM sending. Having offline IM enabled now no longerMelanie Thielker2010-08-042-6/+10
| | | | | | | | | | | | suppresses "Inventory Saved" messages.
* | | A god is a god is a god is a god. Right? Right. You're a god from 200, let'sMelanie Thielker2010-08-041-1/+1
| | | | | | | | | | | | show it!
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-312-16/+56
|\ \ \ | |/ /
| * | remove gods event subscription to gods module from sceneJustin Clark-Casey (justincc)2010-07-301-0/+13
| | |
| * | move attachment subscription events into AttachmentsModule from scene.Justin Clark-Casey (justincc)2010-07-301-1/+22
| | | | | | | | | | | | restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
| * | convert attachments module from old region module style to newJustin Clark-Casey (justincc)2010-07-301-19/+25
| | |
* | | Bannination fixes. Objects in nonpublic parcels were muted by default. GodsMelanie Thielker2010-07-301-1/+5
| | | | | | | | | | | | were muted, too.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-204-157/+213
|\ \ \ | |/ /
| * | adjust DialogModule to only send broadcast alerts to root agentsJustin Clark-Casey (justincc)2010-07-201-2/+3
| | |
| * | Allow communicating with blue box dialogs across a region border via aMelanie Thielker2010-07-171-8/+7
| | | | | | | | | | | | child agent
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-07-144-157/+213
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-07-141-55/+48
| | |\ \
| | * | | improve closing of load/save iar streams in the event of a problemJustin Clark-Casey (justincc)2010-07-144-157/+213
| | | | |
| * | | | Detach attachments displaced by other attachmentsMelanie Thielker2010-07-141-5/+19
| | |/ / | |/| |
* | | | Allow communicating with blue box dialogs across a region border via aMelanie Thielker2010-07-171-8/+7
| | | | | | | | | | | | | | | | child agent
* | | | Detach attachments displaced by other attachmentsMelanie Thielker2010-07-141-5/+19
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-142-6/+128
|\ \ \ \ | |/ / /
| * | | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie2010-07-141-54/+47
| | | | | | | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
| * | | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-4/+4
| |/ /
| * | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing ↵Justin Clark-Casey (justincc)2010-07-142-6/+128
| | | | | | | | | | | | the iar module from being able to save single item iars
* | | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie Thielker2010-07-141-54/+47
| | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
* | | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-4/+4
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-131-9/+9
|\ \ \ | |/ /
| * | uncomment a load iar code line I accidentally commented in the last commitJustin Clark-Casey (justincc)2010-07-121-1/+1
| | | | | | | | | | | | hooray for automated tests
| * | comment out a lot of the debug log messages when loading an iarJustin Clark-Casey (justincc)2010-07-121-10/+10
| | | | | | | | | | | | | | | these are very redundant now and cause issues when loading large iars diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
| * | minor: comment out high volume texture serving module debug messageJustin Clark-Casey (justincc)2010-06-301-2/+2
| |/
* | Fix IMs the right way. This sets it up so that timestamps are actuallyMelanie Thielker2010-07-032-32/+60
| | | | | | | | | | | | | | | | in PST (to match viewer time), does correct storage and retrieval of IMs, corrects the session ID and makes sure IMs don't get marked "saved" if they're live. Removes the group IM save option, which our group IM module never had in the first place, as saving group chatter makes no sense at all.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-021-2/+2
|\ \
| * | minor: comment out high volume texture serving module debug messageJustin Clark-Casey (justincc)2010-06-301-2/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-301-0/+7
|\ \ | |/