ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
33,460 Commits 5 Branches 95 Tags
master
Commit Graph

1890 Commits

Author SHA1 Message Date
Mike Rieker
86decb2aa8 throttle group notices to max of 4 threads at a time 
...otherwise it can create hundreds of threads and hang
 2011-02-20 15:57:57 +00:00
Melanie
4834b47679 Merge branch 'master' into careminster-presence-refactor 2011-02-19 01:59:49 +00:00
Marck
25265c964f Changed console command "alert" and added new command "alert-user". 
This addresses Mantis #4709.
Command "alert" always sends a message to everybody; the variant "alert general" has been removed. Sending messages to one user is done with the dedicated command "alert-user".
 2011-02-16 18:36:57 +01:00
Melanie
6becaf65e1 Fix merge issues 2011-02-07 22:28:59 +00:00
Melanie
3889e68c54 Merge branch 'master' into careminster-presence-refactor 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
	OpenSim/Services/GridService/HypergridLinker.cs
 2011-02-07 22:08:53 +00:00
Diva Canto
8fdc810a23 Addresses mantis #5360: CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information. 2011-02-03 04:07:36 -08:00
Justin Clark-Casey (justincc)
4f7cf491e6 Comment out texture CAPS 'texture not found' message for now 2011-02-02 20:02:10 +00:00
Melanie
24a768a99b Merge branch 'master' into careminster-presence-refactor 2011-01-29 04:47:32 +00:00
Justin Clark-Casey (justincc)
ab1ec3c3cc minor: remove a few mono compiler warnings 2011-01-28 21:51:25 +00:00
Melanie
42c22f41dd Merge branch 'master' into careminster-presence-refactor 2011-01-27 05:18:28 +00:00
Mic Bowman
c4727645b8 Removed a few more spurious appearance saves. When an avatar 
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.
 2011-01-25 14:23:58 -08:00
Melanie
105deab601 Merge branch 'master' into careminster-presence-refactor 2011-01-23 23:29:25 +00:00
Justin Clark-Casey (justincc)
41105948bd remove some mono compiler warnings 2011-01-21 23:19:52 +00:00
Justin Clark-Casey (justincc)
d3dca7d25a For now, comment out logging messages about IM sending, since these cause high spam for large group messaging 2011-01-19 01:50:02 +00:00
Justin Clark-Casey (justincc)
28fda1cab6 with mic's permission, reduce appearance, baked texture logging verbosity for now 2011-01-19 01:41:32 +00:00
Justin Clark-Casey (justincc)
a42faca5b9 With mic's permission, adjust long call time info messages to 500ms from 200ms 2011-01-19 01:13:10 +00:00
Justin Clark-Casey (justincc)
97c0430093 Downgrade and comment out some other caps messages for now 2011-01-19 01:10:09 +00:00
Melanie
f3968c4959 Merge branch 'master' into careminster-presence-refactor 2011-01-18 06:18:10 +00:00
Melanie
9f7b37b37c Fix build break 2011-01-18 01:48:37 +00:00
Melanie
6306578fcf Merge branch 'master' into careminster-presence-refactor 2011-01-18 01:28:50 +00:00
Melanie
ac16a49ca0 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-01-18 01:27:11 +00:00
Melanie
31144a62b3 Change gesture activation to not quash any other flags 2011-01-18 01:26:37 +00:00
Justin Clark-Casey (justincc)
c544f0d0c5 Prune some of the excess logging for client logins. 
Didn't touch the appearance related stuff.
 2011-01-18 00:25:24 +00:00
Melanie
ddb4de139c Change gesture activation to not quash any other flags 2011-01-17 21:22:32 +01:00
Melanie
fe2d9be0cf Implement nonlocal god kicks and freezes 2011-01-14 03:35:45 +01:00
Melanie
69666be28c Implement kicking, freezing and unfreezing users in the same sim via 
profile god buttons.
 2011-01-13 16:05:17 +01:00
Diva Canto
35a2961ccd Added a -v|verbose option to save iar. 2011-01-08 16:17:00 -08:00
Melanie
07cc032081 Allow cross-scope friendships to work, and also allow other cross scope name 
resolution
 2011-01-03 19:42:46 +00:00
Melanie
5432dfd53a Allow cross-scope friendships to work, and also allow other cross scope name 
resolution
 2011-01-02 01:29:22 +01:00
Melanie
24a997eb7c Add MessageKey to section Messaging, a key that prevents injection of 
IM from external sources
 2010-12-30 20:57:56 +01:00
Melanie
dfc0c8dca6 Remove the restriction on communication across scopes. This will allow 
cross-scope users to IM each other.
 2010-12-29 15:13:10 +01:00
Melanie
8186bf2525 Remove some code that was meant to fool the viewer into thinking SLT. It never 
worked and it turned out the issues were really in the backend.
 2010-12-26 07:29:23 +01:00
Melanie
d06456c8b2 Merge branch 'master' into careminster-presence-refactor 2010-12-23 02:57:45 +00:00
Melanie
990e73d7cb Fix a broken format on an error message. Also replace yet another e.Message 
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
 2010-12-22 17:33:06 +00:00
Melanie
11eabf0e51 Merge branch 'master' into careminster-presence-refactor 2010-12-20 02:49:31 +00:00
Justin Clark-Casey (justincc)
223264047e uncomment "load iar" help lines which added the --merge option 2010-12-18 00:59:37 +00:00
Justin Clark-Casey (justincc)
bf9555eaee minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid 2010-12-18 00:57:09 +00:00
Justin Clark-Casey (justincc)
ef43f98686 Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops) 2010-12-18 00:45:56 +00:00
Justin Clark-Casey (justincc)
e62b3dba8a reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being 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
 2010-12-14 00:11:41 +00:00
Melanie
d3b081744e Prevent objects that are worn from ground from vanishing from the scene 2010-12-12 22:12:50 +01:00
Melanie
8aa63093b1 Merge branch 'master' into careminster-presence-refactor 2010-12-12 01:20:46 +00:00
Justin Clark-Casey (justincc)
b46de6e025 Remove the restriction that you have to be logged in when loading/saving iars 
This is pointless as we're supplying the password on the command line
 2010-12-11 03:09:00 +00:00
Justin Clark-Casey (justincc)
387f743993 If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases. 2010-12-11 02:18:16 +00:00
Diva Canto
ab980fc927 Fixed wrong comment 2010-12-08 19:47:05 -08:00
Diva Canto
90bcfefe09 Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet... 2010-12-08 19:37:35 -08:00
Melanie
7fef89847c Merge branch 'master' into careminster-presence-refactor 2010-12-09 02:24:12 +00:00
Diva Canto
1070cffcf9 Added ability for GetTexture to serve multiple formats. The format may come 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>. 2010-12-08 18:53:15 -08:00
Melanie
a4f7937eb3 Add the interface needed to revive calling cards 2010-12-07 03:08:48 +01:00
Melanie
45314c6622 Merge branch 'master' into careminster-presence-refactor 2010-12-06 02:54:51 +00:00
Jonathan Freedman
45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08:00