aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-01-291-2/+2
|\
| * minor: remove a few mono compiler warningsJustin Clark-Casey (justincc)2011-01-281-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-272-14/+13
|\ \ | |/
| * Removed a few more spurious appearance saves. When an avatarMic Bowman2011-01-252-13/+13
| | | | | | | | | | | | | | enters a region the attachments module tries to update the appearance with attachments that are already part of the appearance. Just added a check to only save if the attachments weren't there before.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-236-20/+20
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-01-214-10/+11
| |
| * For now, comment out logging messages about IM sending, since these cause ↵Justin Clark-Casey (justincc)2011-01-191-3/+3
| | | | | | | | high spam for large group messaging
| * with mic's permission, reduce appearance, baked texture logging verbosity ↵Justin Clark-Casey (justincc)2011-01-191-3/+3
| | | | | | | | for now
| * With mic's permission, adjust long call time info messages to 500ms from 200msJustin Clark-Casey (justincc)2011-01-191-1/+1
| |
| * Downgrade and comment out some other caps messages for nowJustin Clark-Casey (justincc)2011-01-191-5/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-181-1/+1
|\ \ | |/
| * Fix build breakMelanie2011-01-181-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-183-4/+4
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-01-183-4/+4
| |\
| | * Prune some of the excess logging for client logins.Justin Clark-Casey (justincc)2011-01-183-4/+4
| | | | | | | | | | | | Didn't touch the appearance related stuff.
| * | Change gesture activation to not quash any other flagsMelanie2011-01-181-3/+3
| |/
| * Added a -v|verbose option to save iar.Diva Canto2011-01-082-1/+9
| |
| * Allow cross-scope friendships to work, and also allow other cross scope nameMelanie2011-01-032-2/+2
| | | | | | | | resolution
* | Change gesture activation to not quash any other flagsMelanie2011-01-171-3/+3
| |
* | Implement nonlocal god kicks and freezesMelanie2011-01-141-4/+35
| |
* | Implement kicking, freezing and unfreezing users in the same sim viaMelanie2011-01-131-58/+117
| | | | | | | | profile god buttons.
* | Allow cross-scope friendships to work, and also allow other cross scope nameMelanie2011-01-022-2/+2
| | | | | | | | resolution
* | Add MessageKey to section Messaging, a key that prevents injection ofMelanie2010-12-301-6/+25
| | | | | | | | IM from external sources
* | Remove the restriction on communication across scopes. This will allowMelanie2010-12-291-1/+1
| | | | | | | | cross-scope users to IM each other.
* | Remove some code that was meant to fool the viewer into thinking SLT. It neverMelanie2010-12-261-18/+19
| | | | | | | | worked and it turned out the issues were really in the backend.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-231-2/+1
|\ \ | |/
| * Fix a broken format on an error message. Also replace yet another e.MessageMelanie2010-12-221-2/+1
| | | | | | | | | | with e.ToString(). e.Message is USELESS, it doesn't tell us what happened where, we should use e.ToSTring() everywhere
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-202-9/+7
|\ \ | |/
| * uncomment "load iar" help lines which added the --merge optionJustin Clark-Casey (justincc)2010-12-181-5/+3
| |
| * minor: add [-p|--profile=<url>] to usage line that pops up if save iar ↵Justin Clark-Casey (justincc)2010-12-181-3/+3
| | | | | | | | console command isn't valid
| * Raise maximum iar version that master can load to 1.x, so that it can load ↵Justin Clark-Casey (justincc)2010-12-181-1/+1
| | | | | | | | its own iars (oops)
| * reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being ↵Justin Clark-Casey (justincc)2010-12-141-0/+16
| | | | | | | | | | | | used by a 3rd party region module and contains non-obvious attachment specific code There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
* | Prevent objects that are worn from ground from vanishing from the sceneMelanie2010-12-121-9/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-124-78/+93
|\ \ | |/
| * Remove the restriction that you have to be logged in when loading/saving iarsJustin Clark-Casey (justincc)2010-12-112-72/+70
| | | | | | | | This is pointless as we're supplying the password on the command line
| * If we're saving an IAR with --profile information, then label this a version ↵Justin Clark-Casey (justincc)2010-12-111-5/+22
| | | | | | | | 1.0 IAR since it isn't compatible with older OpenSim releases.
| * Fixed wrong commentDiva Canto2010-12-081-1/+1
| |
| * Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase ↵Diva Canto2010-12-081-1/+1
| | | | | | | | yet...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-42/+202
|\ \ | |/
| * Added ability for GetTexture to serve multiple formats. The format may come ↵Diva Canto2010-12-081-42/+202
| | | | | | | | as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
* | Add the interface needed to revive calling cardsMelanie2010-12-071-0/+13
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-3/+3
|\ \ | |/
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-055-101/+145
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-231-55/+50
| |\ \
| * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-213-77/+94
| |\ \ \
| * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-36/+39
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-5/+10
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-32/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| * \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-29/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-43/+62
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
generated by cgit v1.1 at 2024-12-21 02:16:51 +0000