Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 2 | -10/+11 |
|\ | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -3/+3 |
| | | |||||
| * | refactor: remove Scene.SetRootAgentScene() in favour of existing event with ↵ | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -7/+8 |
| | | | | | | | | same name | ||||
* | | Fix the general alert message so it doesn't get sent to child agents | meta7 | 2010-08-07 | 1 | -220/+223 |
| | | |||||
* | | and another one... | sacha | 2010-08-07 | 1 | -1/+1 |
| | | |||||
* | | Clean the loo after use please !!!!! | sacha | 2010-08-07 | 1 | -4/+4 |
| | | | | | | | | | | No need to keep useless debug message ! Never heard of wasted cpucycle you darn kid ! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-07 | 1 | -1/+1 |
| |\ | |||||
| | * | Remove old test classes that don't actually test anything not done elsewhere | Justin Clark-Casey (justincc) | 2010-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Also comment out log4net line in InventoryArchiverTests | ||||
| * | | Change the (hackish) constant to match the changed enum for attachs | Melanie Thielker | 2010-08-07 | 1 | -2/+2 |
| |/ | |||||
* | | Change the (hackish) constant to match the changed enum for attachs | Melanie Thielker | 2010-08-07 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 3 | -80/+134 |
|\ \ | |/ | |||||
| * | Merge branch 'iar-merge' | Justin Clark-Casey (justincc) | 2010-08-04 | 3 | -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-30 | 3 | -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 longer | Melanie Thielker | 2010-08-04 | 2 | -6/+10 |
| | | | | | | | | | | | | suppresses "Inventory Saved" messages. | ||||
* | | | Cost Reduction : Removing verbose message.... | sacha | 2010-08-04 | 1 | -1/+1 |
| | | | |||||
* | | | Clean up some messiness in IM sending. Having offline IM enabled now no longer | Melanie Thielker | 2010-08-04 | 2 | -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's | Melanie Thielker | 2010-08-04 | 1 | -1/+1 |
| | | | | | | | | | | | | show it! | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-31 | 2 | -16/+56 |
|\ \ \ | |/ / | |||||
| * | | remove gods event subscription to gods module from scene | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -0/+13 |
| | | | |||||
| * | | move attachment subscription events into AttachmentsModule from scene. | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -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 new | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -19/+25 |
| | | | |||||
* | | | Bannination fixes. Objects in nonpublic parcels were muted by default. Gods | Melanie Thielker | 2010-07-30 | 1 | -1/+5 |
| | | | | | | | | | | | | were muted, too. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-20 | 4 | -157/+213 |
|\ \ \ | |/ / | |||||
| * | | adjust DialogModule to only send broadcast alerts to root agents | Justin Clark-Casey (justincc) | 2010-07-20 | 1 | -2/+3 |
| | | | |||||
| * | | Allow communicating with blue box dialogs across a region border via a | Melanie Thielker | 2010-07-17 | 1 | -8/+7 |
| | | | | | | | | | | | | child agent | ||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-07-14 | 4 | -157/+213 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 1 | -55/+48 |
| | |\ \ | |||||
| | * | | | improve closing of load/save iar streams in the event of a problem | Justin Clark-Casey (justincc) | 2010-07-14 | 4 | -157/+213 |
| | | | | | |||||
| * | | | | Detach attachments displaced by other attachments | Melanie Thielker | 2010-07-14 | 1 | -5/+19 |
| | |/ / | |/| | | |||||
* | | | | Allow communicating with blue box dialogs across a region border via a | Melanie Thielker | 2010-07-17 | 1 | -8/+7 |
| | | | | | | | | | | | | | | | | child agent | ||||
* | | | | Detach attachments displaced by other attachments | Melanie Thielker | 2010-07-14 | 1 | -5/+19 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-14 | 2 | -6/+128 |
|\ \ \ \ | |/ / / | |||||
| * | | | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie | 2010-07-14 | 1 | -54/+47 |
| | | | | | | | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | ||||
| * | | | Remove useless quaternion parameter from AttachObject sig | Melanie Thielker | 2010-07-14 | 1 | -4/+4 |
| |/ / | |||||
| * | | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing ↵ | Justin Clark-Casey (justincc) | 2010-07-14 | 2 | -6/+128 |
| | | | | | | | | | | | | the iar module from being able to save single item iars | ||||
* | | | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie Thielker | 2010-07-14 | 1 | -54/+47 |
| | | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | ||||
* | | | Remove useless quaternion parameter from AttachObject sig | Melanie Thielker | 2010-07-14 | 1 | -4/+4 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-13 | 1 | -9/+9 |
|\ \ \ | |/ / | |||||
| * | | uncomment a load iar code line I accidentally commented in the last commit | Justin Clark-Casey (justincc) | 2010-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | hooray for automated tests | ||||
| * | | comment out a lot of the debug log messages when loading an iar | Justin Clark-Casey (justincc) | 2010-07-12 | 1 | -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 message | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+2 |
| |/ | |||||
* | | Fix IMs the right way. This sets it up so that timestamps are actually | Melanie Thielker | 2010-07-03 | 2 | -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-refactor | Melanie | 2010-07-02 | 1 | -2/+2 |
|\ \ | |||||
| * | | minor: comment out high volume texture serving module debug message | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-30 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | One more bug fix in FriendsModule: GrantRights. One of the caches was not ↵ | Diva Canto | 2010-06-28 | 1 | -0/+7 |
| | | | | | | | | being updated. | ||||
| * | Security fix: Allow only textures to be fetched using HTTP texture cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
| | | |||||
* | | Force IM timestamps to current server time to prevent "Saved on" headers | Melanie Thielker | 2010-06-28 | 1 | -0/+4 |
| | | | | | | | | while the sender is online | ||||
* | | Add the object owner UUID into the binary bucket of object to user IM | Melanie Thielker | 2010-06-24 | 1 | -0/+2 |
| | |